mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
Fix for various crashing and merc placement issues when getting ambushed (by Shadooow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8981 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1800,11 +1800,11 @@ void PutDownMercPiece( INT32 iPlacement )
|
|||||||
|
|
||||||
if ( GetEnemyEncounterCode() == ENEMY_AMBUSH_DEPLOYMENT_CODE )
|
if ( GetEnemyEncounterCode() == ENEMY_AMBUSH_DEPLOYMENT_CODE )
|
||||||
{
|
{
|
||||||
ubDirection = (UINT8)GetDirectionToGridNoFromGridNo( gMapInformation.sCenterGridNo, sGridNo ) + 100;
|
ubDirection = (UINT8)GetDirectionToGridNoFromGridNo( gMapInformation.sCenterGridNo, sGridNo );
|
||||||
}
|
}
|
||||||
|
|
||||||
pSoldier->EVENT_SetSoldierDirection( ubDirection );
|
pSoldier->EVENT_SetSoldierDirection( ubDirection );
|
||||||
pSoldier->ubInsertionDirection = pSoldier->ubDirection;
|
ubDirection += 100;
|
||||||
|
pSoldier->ubInsertionDirection = ubDirection;
|
||||||
|
|
||||||
gMercPlacement[ iPlacement ].fPlaced = TRUE;
|
gMercPlacement[ iPlacement ].fPlaced = TRUE;
|
||||||
gMercPlacement[ iPlacement ].pSoldier->bInSector = TRUE;
|
gMercPlacement[ iPlacement ].pSoldier->bInSector = TRUE;
|
||||||
|
|||||||
Reference in New Issue
Block a user