From 09270c04f06311b0a05596c07e0a08b87ea457b0 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Sat, 24 Apr 2021 13:31:56 +0000 Subject: [PATCH] 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 --- TacticalAI/AIMain.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp index b7d611f8e..3553ed181 100644 --- a/TacticalAI/AIMain.cpp +++ b/TacticalAI/AIMain.cpp @@ -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; + } }