From fdbd8b248d80f97af8312468237dfd0df486d594 Mon Sep 17 00:00:00 2001 From: Kaloyan Chehlarski Date: Sun, 24 Sep 2023 23:49:07 +0300 Subject: [PATCH] NANCY: Stop record processing after changing scene Further ActionRecords now stop being processed as soon as changeScene() is called, instead of getting one last frame of processing. This fixes nancy4 scene 5708, where clicking the gate circle would previously activate a sound effect that it shouldn't --- engines/nancy/action/actionmanager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/engines/nancy/action/actionmanager.cpp b/engines/nancy/action/actionmanager.cpp index 6b625912cb1..1cd82940aab 100644 --- a/engines/nancy/action/actionmanager.cpp +++ b/engines/nancy/action/actionmanager.cpp @@ -257,10 +257,14 @@ void ActionManager::processActionRecords() { record->execute(); } + + if (NancySceneState._state == State::Scene::kLoad) { + // changeScene() must have been called, abort any further processing + return; + } } synchronizeMovieWithSound(); - debugDrawHotspots(); }