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

Fix AI soldiers losing ready stance while deciding next move

Browse Source 
Fix LUA crashing when game shuts down (caused by incomplete merge)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Overhaul
2007-10-21 05:43:45 +00:00
parent 13288fd750
commit b0b9d14154
12 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Assignments.cpp
+4 -4
View File
@@ -5491,7 +5491,7 @@ void MakeSureToolKitIsInHand( SOLDIERTYPE *pSoldier )
{
if( Item[pSoldier -> inv[ bPocket ].usItem].toolkit )
{
SwapObjs( pSoldier, HANDPOS, bPocket );
SwapObjs( pSoldier, HANDPOS, bPocket, TRUE );
break;
}
}
@@ -5519,7 +5519,7 @@ BOOLEAN MakeSureMedKitIsInHand( SOLDIERTYPE *pSoldier )
if ( Item[pSoldier -> inv[ bPocket ].usItem].medicalkit )
{
fCharacterInfoPanelDirty = TRUE;
SwapObjs( pSoldier, HANDPOS, bPocket );
SwapObjs( pSoldier, HANDPOS, bPocket, TRUE );
return(TRUE);
}
}
@@ -5539,14 +5539,14 @@ BOOLEAN MakeSureMedKitIsInHand( SOLDIERTYPE *pSoldier )
if( ( Item[ pSoldier -> inv[ HANDPOS ].usItem ].twohanded ) && ( bPocket >= SMALLPOCK1POS ) )
{
// first move from hand to second hand
SwapObjs( pSoldier, HANDPOS, SECONDHANDPOS );
SwapObjs( pSoldier, HANDPOS, SECONDHANDPOS, TRUE );
// dirty mapscreen and squad panels
fCharacterInfoPanelDirty = TRUE;
fInterfacePanelDirty = DIRTYLEVEL2;
}
SwapObjs( pSoldier, HANDPOS, bPocket );
SwapObjs( pSoldier, HANDPOS, bPocket, TRUE );
return(TRUE);