aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2007-06-16 01:58:03 +0000
committerFilippos Karapetis2007-06-16 01:58:03 +0000
commitb37161bafd8045b3f094620e7cb42549db2e6db5 (patch)
treeafd51068d0609ad325878271e5983387a768e0ff
parent85ce1d85cac75ba7937a4819a69b11ba5d58e9d2 (diff)
downloadscummvm-rg350-b37161bafd8045b3f094620e7cb42549db2e6db5.tar.gz
scummvm-rg350-b37161bafd8045b3f094620e7cb42549db2e6db5.tar.bz2
scummvm-rg350-b37161bafd8045b3f094620e7cb42549db2e6db5.zip
IHNM: Added a temporary workaround for the nightfall scene in Ben's chapter
svn-id: r27438
-rw-r--r--engines/saga/sfuncs.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp
index c84a09e7bf..eae0001702 100644
--- a/engines/saga/sfuncs.cpp
+++ b/engines/saga/sfuncs.cpp
@@ -1920,6 +1920,14 @@ void Script::sfWaitFrames(SCRIPTFUNC_PARAMS) {
int16 frames;
frames = thread->pop();
+ // HACK for the nightfall scene in Benny's chapter
+ // sfWaitFrames is supposed to wait for fadein and fadeout during that cutaway, but we
+ // don't support it yet (function sfScriptFade). This is a temporary hack to avoid
+ // having ScummVM wait for ever in that cutaway
+ // FIXME: Remove this hack once the palette fading is properly handled
+ if (_vm->_scene->currentChapterNumber() == 2 && _vm->_scene->currentSceneNumber() == 41 && _vm->_anim->hasCutaway())
+ return;
+
if (!_skipSpeeches)
thread->waitFrames(_vm->_frameCount + frames);
}