From e7251981c0870727e015776815ac03dca6656abe Mon Sep 17 00:00:00 2001 From: Shadooow Date: Fri, 9 Jul 2021 14:23:34 +0000 Subject: [PATCH] Fix: reloading sector with merc inside will no longer reset their animation and direction. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9136 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Add.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tactical/Soldier Add.cpp b/Tactical/Soldier Add.cpp index f5fcc415..e3438402 100644 --- a/Tactical/Soldier Add.cpp +++ b/Tactical/Soldier Add.cpp @@ -1315,8 +1315,8 @@ BOOLEAN InternalAddSoldierToSector( UINT8 ubID, BOOLEAN fCalculateDirection, BOO } //Add - if(gTacticalStatus.uiFlags & LOADING_SAVED_GAME ) - AddSoldierToSectorGridNo( pSoldier, sGridNo, pSoldier->ubDirection, fUseAnimation, usAnimState, usAnimCode ); + if(gTacticalStatus.uiFlags & LOADING_SAVED_GAME || pSoldier->ubStrategicInsertionCode == INSERTION_CODE_GRIDNO) + AddSoldierToSectorGridNo( pSoldier, sGridNo, pSoldier->ubDirection, false, usAnimState, usAnimCode ); else AddSoldierToSectorGridNo( pSoldier, sGridNo, ubDirection, fUseAnimation, usAnimState, usAnimCode ); @@ -1719,7 +1719,7 @@ void AddSoldierToSectorGridNo( SOLDIERTYPE *pSoldier, INT32 sGridNo, UINT8 ubDir { pSoldier->EVENT_InitNewSoldierAnim( usAnimState, usAnimCode, TRUE ); } - else if ( pSoldier->ubBodyType != CROW ) + else if ( pSoldier->ubBodyType != CROW && ubInsertionCode != INSERTION_CODE_GRIDNO) { pSoldier->EVENT_InitNewSoldierAnim( STANDING, 1, TRUE ); }