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

fixed regression that caused mercs to keep their direction&animation when moving into another sector

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9204 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-10-28 18:29:35 +00:00
parent 14e963e338
commit 61f56fe0e6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Add.cpp
+5 -3
View File
@@ -1194,6 +1194,7 @@ BOOLEAN InternalAddSoldierToSector( UINT8 ubID, BOOLEAN fCalculateDirection, BOO
pSoldier->usQuoteSaidFlags &= (~SOLDIER_QUOTE_SAID_SMELLED_CREATURE); pSoldier->usQuoteSaidFlags &= (~SOLDIER_QUOTE_SAID_SMELLED_CREATURE);
pSoldier->usQuoteSaidFlags &= (~SOLDIER_QUOTE_SAID_WORRIED_ABOUT_CREATURES); pSoldier->usQuoteSaidFlags &= (~SOLDIER_QUOTE_SAID_WORRIED_ABOUT_CREATURES);
BOOLEAN gfEnteredFromTacticalPlacement = FALSE;
// Add to interface if the are ours // Add to interface if the are ours
if ( pSoldier->bTeam == CREATURE_TEAM ) if ( pSoldier->bTeam == CREATURE_TEAM )
{ {
@@ -1286,6 +1287,7 @@ BOOLEAN InternalAddSoldierToSector( UINT8 ubID, BOOLEAN fCalculateDirection, BOO
{ {
pSoldier->ubInsertionDirection = pSoldier->ubInsertionDirection - 100; pSoldier->ubInsertionDirection = pSoldier->ubInsertionDirection - 100;
fCalculateDirection = FALSE; fCalculateDirection = FALSE;
gfEnteredFromTacticalPlacement = TRUE;
} }
if ( fCalculateDirection ) if ( fCalculateDirection )
@@ -1315,8 +1317,8 @@ BOOLEAN InternalAddSoldierToSector( UINT8 ubID, BOOLEAN fCalculateDirection, BOO
} }
//Add //Add
if(gTacticalStatus.uiFlags & LOADING_SAVED_GAME || pSoldier->ubStrategicInsertionCode == INSERTION_CODE_GRIDNO) if(gTacticalStatus.uiFlags & LOADING_SAVED_GAME || (pSoldier->ubStrategicInsertionCode == INSERTION_CODE_GRIDNO && !gfEnteredFromTacticalPlacement))
AddSoldierToSectorGridNo( pSoldier, sGridNo, pSoldier->ubDirection, false, usAnimState, usAnimCode ); AddSoldierToSectorGridNo( pSoldier, sGridNo, pSoldier->ubDirection, TRUE, -1, 0);//shadooow: hack to make sure animations aren't changed
else else
AddSoldierToSectorGridNo( pSoldier, sGridNo, ubDirection, fUseAnimation, usAnimState, usAnimCode ); AddSoldierToSectorGridNo( pSoldier, sGridNo, ubDirection, fUseAnimation, usAnimState, usAnimCode );
@@ -1719,7 +1721,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 && ubInsertionCode != INSERTION_CODE_GRIDNO) else if ( pSoldier->ubBodyType != CROW)
{ {
pSoldier->EVENT_InitNewSoldierAnim( STANDING, 1, TRUE ); pSoldier->EVENT_InitNewSoldierAnim( STANDING, 1, TRUE );
} }