aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-11-20 00:52:05 +0000
committerFilippos Karapetis2010-11-20 00:52:05 +0000
commitb2ba35124c707ca33e0372690a0eb25e316bce8a (patch)
tree101058834517302192989d15250d3d919d5ae62a
parentc8ef70ea1c7c6d94a0f0cddfeb17d8b5ae7241f1 (diff)
downloadscummvm-rg350-b2ba35124c707ca33e0372690a0eb25e316bce8a.tar.gz
scummvm-rg350-b2ba35124c707ca33e0372690a0eb25e316bce8a.tar.bz2
scummvm-rg350-b2ba35124c707ca33e0372690a0eb25e316bce8a.zip
SCI: Fixed timer bug #3109139 - "SQ4: Crash after exiting Skate-o-Rama during chase"
svn-id: r54391
-rw-r--r--engines/sci/engine/kmisc.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 75582f3449..90ddf4d7ea 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -75,6 +75,17 @@ reg_t kGameIsRestarting(EngineState *s, int argc, reg_t *argv) {
neededSleep = 60;
}
break;
+ case GID_SQ4:
+ // In SQ4 (floppy and CD) the sequel police appear way too quickly in
+ // the Skate-o-rama rooms, resulting in all sorts of timer issues, like
+ // #3109139 (which occurs because a police officer instantly teleports
+ // just before Roger exits and shoots him). We throttle these scenes a
+ // bit more, in order to prevent timer bugs related to the sequel police
+ if (s->currentRoomNumber() == 405 || s->currentRoomNumber() == 406 ||
+ s->currentRoomNumber() == 410 || s->currentRoomNumber() == 411) {
+ s->_throttleTrigger = true;
+ neededSleep = 60;
+ }
default:
break;
}