From b37161bafd8045b3f094620e7cb42549db2e6db5 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sat, 16 Jun 2007 01:58:03 +0000 Subject: IHNM: Added a temporary workaround for the nightfall scene in Ben's chapter svn-id: r27438 --- engines/saga/sfuncs.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) 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); } -- cgit v1.2.3