1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: reloading sector with merc inside will no longer reset their animation and direction.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9136 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-07-09 14:23:34 +00:00
parent 0766cbb602
commit e7251981c0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Add.cpp
+3 -3
View File
@@ -1315,8 +1315,8 @@ BOOLEAN InternalAddSoldierToSector( UINT8 ubID, BOOLEAN fCalculateDirection, BOO
} }
//Add //Add
if(gTacticalStatus.uiFlags & LOADING_SAVED_GAME ) if(gTacticalStatus.uiFlags & LOADING_SAVED_GAME || pSoldier->ubStrategicInsertionCode == INSERTION_CODE_GRIDNO)
AddSoldierToSectorGridNo( pSoldier, sGridNo, pSoldier->ubDirection, fUseAnimation, usAnimState, usAnimCode ); AddSoldierToSectorGridNo( pSoldier, sGridNo, pSoldier->ubDirection, false, usAnimState, usAnimCode );
else else
AddSoldierToSectorGridNo( pSoldier, sGridNo, ubDirection, fUseAnimation, usAnimState, usAnimCode ); 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 ); 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 ); pSoldier->EVENT_InitNewSoldierAnim( STANDING, 1, TRUE );
} }