From e156f0ff8771e1e25e042117a3fe1b09c7f47b25 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 24 Aug 2007 13:40:03 +0000 Subject: The frame count needs to be updated for cutaways without an animation bit as well. Removed a hack for the nightfall scene in Benny's chapter svn-id: r28709 --- engines/saga/sfuncs.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'engines/saga/sfuncs.cpp') diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp index 717fbc9c9c..8296cf2a0c 100644 --- a/engines/saga/sfuncs.cpp +++ b/engines/saga/sfuncs.cpp @@ -1943,14 +1943,6 @@ 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