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:
Overhaul
2007-10-21 05:43:45 +00:00
parent 13288fd750
commit b0b9d14154
12 changed files with 44 additions and 36 deletions
+2 -2
View File
@@ -429,7 +429,7 @@ INT8 DecideAutoBandage( SOLDIERTYPE * pSoldier )
{
pSoldier->bSlotItemTakenFrom = bSlot;
SwapObjs( pSoldier, HANDPOS, bSlot );
SwapObjs( pSoldier, HANDPOS, bSlot, TRUE );
/*
memset( &TempObj, 0, sizeof( OBJECTTYPE ) );
// move the med kit out to temp obj
@@ -452,7 +452,7 @@ INT8 DecideAutoBandage( SOLDIERTYPE * pSoldier )
{
pSoldier->bSlotItemTakenFrom = bSlot;
SwapObjs( pSoldier, HANDPOS, bSlot );
SwapObjs( pSoldier, HANDPOS, bSlot, TRUE );
}
return( pSoldier->bAction );
}