diff options
author | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
---|---|---|
committer | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
commit | 798ddfaab500bb212f620cf095328eee5eb140a4 (patch) | |
tree | 55b5d0b90affd88063c04b7ff62fea1616b83e80 /engines/saga | |
parent | ef663f95a516d8fe47a245653d418c047361281a (diff) | |
parent | fdc80fd952120ecb8a4941edd4c2e404cdc5fa33 (diff) | |
download | scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.gz scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.bz2 scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.zip |
Merge branch 'master' into hopkins
Diffstat (limited to 'engines/saga')
-rw-r--r-- | engines/saga/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp index 96746b538c..3efc554cb3 100644 --- a/engines/saga/script.cpp +++ b/engines/saga/script.cpp @@ -948,7 +948,7 @@ void Script::opSpeak(SCRIPTOP_PARAMS) { // scripts change to scene 5, but do not clear the cutaway that appears // before Gorrister's speech starts, resulting in a deadlock. We do this // manually here. - if (_vm->getGameId() == GID_IHNM && _vm->_scene->currentChapterNumber() == 1 && + if (_vm->getGameId() == GID_IHNM && _vm->_scene->currentChapterNumber() == 1 && _vm->_scene->currentSceneNumber() == 5 && _vm->_anim->hasCutaway()) { _vm->_anim->returnFromCutaway(); } |