mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
Fix AI soldiers losing ready stance while deciding next move
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:
@@ -2319,8 +2319,10 @@ void RearrangePocket(SOLDIERTYPE *pSoldier, INT8 bPocket1, INT8 bPocket2, UINT8
|
||||
{
|
||||
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"RearrangePocket");
|
||||
// NB there's no such thing as a temporary swap for now...
|
||||
// 0verhaul: There is now! If not permanent, don't lose weapon ready status because the
|
||||
// weapon will be restored after the trial situation is finished.
|
||||
//SwapObjs( &(pSoldier->inv[bPocket1]), &(pSoldier->inv[bPocket2]) );
|
||||
SwapObjs( pSoldier, bPocket1, bPocket2 );
|
||||
SwapObjs( pSoldier, bPocket1, bPocket2, bPermanent );
|
||||
|
||||
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"RearrangePocket done");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user