diff options
| author | Filippos Karapetis | 2007-08-24 13:40:03 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-08-24 13:40:03 +0000 |
| commit | e156f0ff8771e1e25e042117a3fe1b09c7f47b25 (patch) | |
| tree | 9cd9c7b2a6bc98371e3848db095275f6756950bd /engines/saga/sfuncs.cpp | |
| parent | 3a761c8acd843e9410ac0a3b98971bd37c4911e3 (diff) | |
| download | scummvm-rg350-e156f0ff8771e1e25e042117a3fe1b09c7f47b25.tar.gz scummvm-rg350-e156f0ff8771e1e25e042117a3fe1b09c7f47b25.tar.bz2 scummvm-rg350-e156f0ff8771e1e25e042117a3fe1b09c7f47b25.zip | |
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
Diffstat (limited to 'engines/saga/sfuncs.cpp')
| -rw-r--r-- | engines/saga/sfuncs.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
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); } |