aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/scene_v2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra/scene_v2.cpp')
-rw-r--r--engines/kyra/scene_v2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp
index 6a588178d4..56f9bdc831 100644
--- a/engines/kyra/scene_v2.cpp
+++ b/engines/kyra/scene_v2.cpp
@@ -247,7 +247,7 @@ int KyraEngine_v2::trySceneChange(int *moveTable, int unk1, int updateChar) {
int changedScene = 0;
const int *moveTableStart = moveTable;
_unk4 = 0;
- while (running) {
+ while (running && !_quitFlag) {
if (*moveTable >= 0 && *moveTable <= 7) {
_mainCharacter.facing = getOppositeFacingDirection(*moveTable);
unkFlag = true;
@@ -898,7 +898,7 @@ void KyraEngine_v2::fadeScenePal(int srcIndex, int delayTime) {
memcpy(dst, src, 48);
// TODO: original passes delay function too
- _screen->fadePalette(_screen->getPalette(0), delayTime);
+ _screen->fadePalette(_screen->getPalette(0), delayTime, &_updateFunctor);
}
} // end of namespace Kyra