mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
Fix Deidranna endless clock in cutscene.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1435,7 +1435,7 @@ void NPCDoesNothing(SOLDIERTYPE *pSoldier)
|
||||
}
|
||||
|
||||
|
||||
|
||||
extern BOOLEAN AreInMeanwhile();
|
||||
|
||||
void CancelAIAction(SOLDIERTYPE *pSoldier, UINT8 ubForce)
|
||||
{
|
||||
@@ -1470,10 +1470,13 @@ void CancelAIAction(SOLDIERTYPE *pSoldier, UINT8 ubForce)
|
||||
ActionDone(pSoldier);
|
||||
|
||||
// sevenfm: reset next action
|
||||
pSoldier->aiData.bNextAction = AI_ACTION_NONE;
|
||||
pSoldier->aiData.usNextActionData = 0;
|
||||
pSoldier->aiData.bNextTargetLevel = 0;
|
||||
pSoldier->iNextActionSpecialData = 0;
|
||||
if(!AreInMeanwhile())
|
||||
{
|
||||
pSoldier->aiData.bNextAction = AI_ACTION_NONE;
|
||||
pSoldier->aiData.usNextActionData = 0;
|
||||
pSoldier->aiData.bNextTargetLevel = 0;
|
||||
pSoldier->iNextActionSpecialData = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user