thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r28709
This commit is contained in:
Filippos Karapetis 2007-08-24 13:40:03 +00:00
parent 3a761c8acd
commit e156f0ff87
2 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/saga/sfuncs.cpp
View file

@ -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);
}