diff options
| -rw-r--r-- | engines/kyra/scene_v2.cpp | 12 | ||||
| -rw-r--r-- | engines/kyra/script_v2.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp index b3b4e6e3b3..da0828057c 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/scene_v2.cpp @@ -258,7 +258,12 @@ int KyraEngine_v2::trySceneChange(int *moveTable, int unk1, int updateChar) { } if (unk1) { - //XXX + // TODO: check this again + int inputFlag = checkInput(0/*dword_324C5*/); + if (inputFlag == 198 || inputFlag == 199) { + running = false; + _unk4 = 1; + } } if (!unkFlag || !running) @@ -273,11 +278,6 @@ int KyraEngine_v2::trySceneChange(int *moveTable, int unk1, int updateChar) { if (ret) ++moveTable; - // TODO: check this again - int inputFlag = checkInput(0/*dword_324C5*/); - if (inputFlag == 198 || inputFlag == 199) - break; - ++updateType; if (!updateType) { update(); diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index 1e17aed3c5..9794844cc8 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -470,7 +470,7 @@ int KyraEngine_v2::o2_runTemporaryScript(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "o2_runTemporaryScript(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3)); - runTemporaryScript(stackPosString(0), stackPos(2) ? 1 : 0, stackPos(1), stackPos(2), stackPos(3)); + runTemporaryScript(stackPosString(0), stackPos(3), stackPos(2) ? 1 : 0, stackPos(1), stackPos(2)); return 0; } |