aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/script_hof.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2008-05-14 09:43:41 +0000
committerTorbjörn Andersson2008-05-14 09:43:41 +0000
commit97855800b6592cf9c9bc2b010c13cdd07575f5e2 (patch)
tree2e2b657cc71f551dcfcda6c4b55e82efb0fc04ea /engines/kyra/script_hof.cpp
parentec0e836925152b219f4f27030819059b5aa52856 (diff)
downloadscummvm-rg350-97855800b6592cf9c9bc2b010c13cdd07575f5e2.tar.gz
scummvm-rg350-97855800b6592cf9c9bc2b010c13cdd07575f5e2.tar.bz2
scummvm-rg350-97855800b6592cf9c9bc2b010c13cdd07575f5e2.zip
Oops, I definitely meant for that to be '==', not '='. I guess this is what it
should look like, but I can't actually test (or even compile) it right now. svn-id: r32103
Diffstat (limited to 'engines/kyra/script_hof.cpp')
-rw-r--r--engines/kyra/script_hof.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp
index 7d1f41273d..e481aedb07 100644
--- a/engines/kyra/script_hof.cpp
+++ b/engines/kyra/script_hof.cpp
@@ -907,17 +907,13 @@ int KyraEngine_HoF::o2_updateSceneAnim(EMCState *script) {
// animation.
// - When the sheriff enters the jail, either to lock you up or to throw
// away the key. (see bug #1926838 "HoF: Animation plays too fast").
- // Adding the workaround for the first case also fixes the second,
- // even though stackPos(0) is different then.
-
- // FIXME: Shouldn't the check for scene 27 be stackPos(0) == 1? Or is the change to
- // stackPos(0) intentional here?
if ((stackPos(0) == 2 && _mainCharacter.sceneId == 3) ||
(stackPos(0) == 3 && _mainCharacter.sceneId == 33) ||
((stackPos(0) == 1 || stackPos(0) == 2) && _mainCharacter.sceneId == 19) ||
- (stackPos(0) = 1 && _mainCharacter.sceneId == 27))
+ ((stackPos(0) == 1 || stackPos(0) == 2) && _mainCharacter.sceneId == 27)) {
_sceneSpecialScriptsTimer[_lastProcessedSceneScript] = _system->getMillis() + _tickLength * 6;
+ }
_specialSceneScriptRunFlag = false;
return 0;