1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +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
Tactical/Interface Dialogue.cpp
+3 -3
View File
@@ -1196,7 +1196,7 @@ BOOLEAN HandleTalkingMenuEscape( BOOLEAN fCanDelete , BOOLEAN fFromEscKey )
void HandleTalkingMenuBackspace( void )
{
FACETYPE *pFace;
BOOLEAN fTalking = FALSE;
//BOOLEAN fTalking = FALSE;
if ( !gfInTalkPanel )
{
@@ -2225,7 +2225,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
bItemIn = FindAIUsableObjClass( pSoldier, IC_GUN );
if (bItemIn != NO_SLOT && bItemIn != HANDPOS)
{
SwapObjs( pSoldier, HANDPOS, bItemIn );
SwapObjs( pSoldier, HANDPOS, bItemIn, TRUE );
sGridNo = pSoldier->sGridNo + DirectionInc( pSoldier->ubDirection );
SoldierReadyWeapon( pSoldier, (INT16) (sGridNo % WORLD_COLS), (INT16) (sGridNo / WORLD_COLS), FALSE );
}
@@ -3114,7 +3114,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
if (bMoneySlot < bEmptySlot)
{
// move main stash to later in inventory!
SwapObjs( pSoldier, bEmptySlot, bMoneySlot );
SwapObjs( pSoldier, bEmptySlot, bMoneySlot, TRUE );
SoldierGiveItem( pSoldier, pSoldier2, &(pSoldier->inv[ bMoneySlot ] ), bMoneySlot );
}
else