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

Fix possible bug when executing AI_ACTION_STOP_COWERING.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8742 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-02-06 17:18:49 +00:00
parent 1455409057
commit e4d30987bf
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/AIMain.cpp
+15 -14
View File
@@ -2147,8 +2147,14 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier)
} }
break; break;
case AI_ACTION_STOP_COWERING: case AI_ACTION_STOP_COWERING:
if (SoldierAI(pSoldier)) if (pSoldier->flags.uiStatusFlags & SOLDIER_COWERING)
{
// stop cowering for civilians
pSoldier->aiData.usActionData = ANIM_STAND;
pSoldier->SetSoldierCowerState(FALSE);
}
else if (SoldierAI(pSoldier) && (pSoldier->usAnimState == COWERING || pSoldier->usAnimState == COWERING_PRONE))
{ {
// sevenfm: stop cowering for soldiers // sevenfm: stop cowering for soldiers
if (pSoldier->usAnimState == COWERING) if (pSoldier->usAnimState == COWERING)
@@ -2174,19 +2180,14 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier)
} }
// clear cowering flag // clear cowering flag
pSoldier->flags.uiStatusFlags &= (~SOLDIER_COWERING); pSoldier->flags.uiStatusFlags &= (~SOLDIER_COWERING);
ActionDone(pSoldier);
}
else
{
// nothing to do!
ActionDone(pSoldier);
return(FALSE);
} }
else if (pSoldier->flags.uiStatusFlags & SOLDIER_COWERING)
{
// stop cowering for civilians
pSoldier->aiData.usActionData = ANIM_STAND;
pSoldier->SetSoldierCowerState(FALSE);
}
else
{
// nothing to do!
ActionDone(pSoldier);
return(FALSE);
}
break; break;
case AI_ACTION_GIVE_AID: // help injured/dying friend case AI_ACTION_GIVE_AID: // help injured/dying friend