diff options
author | Filippos Karapetis | 2007-08-25 16:00:50 +0000 |
---|---|---|
committer | Filippos Karapetis | 2007-08-25 16:00:50 +0000 |
commit | 4afe739687c216ed0808c581460a5f154a90aca3 (patch) | |
tree | 33aa95fbe027609726e90ed739c43d83642078ba | |
parent | 433105141b820c40db0561d22e7f69c0257eaf49 (diff) | |
download | scummvm-rg350-4afe739687c216ed0808c581460a5f154a90aca3.tar.gz scummvm-rg350-4afe739687c216ed0808c581460a5f154a90aca3.tar.bz2 scummvm-rg350-4afe739687c216ed0808c581460a5f154a90aca3.zip |
The intro of IHNM is shown correctly now
svn-id: r28723
-rw-r--r-- | engines/saga/animation.cpp | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/engines/saga/animation.cpp b/engines/saga/animation.cpp index baf219f130..fe29eca236 100644 --- a/engines/saga/animation.cpp +++ b/engines/saga/animation.cpp @@ -85,16 +85,6 @@ void Anim::playCutaway(int cut, bool fade) { _cutAwayFade = fade; - // Chained cutaway, clean up the previous cutaway - if (_cutawayActive) { - clearCutaway(); - - // This is used because when AM is zapping the child's mother in Benny's chapter, - // there is a cutaway followed by a video. The video needs to start immediately after - // the cutaway so that it looks like the original - startImmediately = true; - } - _vm->_gfx->savePalette(); if (fade) { @@ -118,15 +108,20 @@ void Anim::playCutaway(int cut, bool fade) { } // Prepare cutaway - _vm->_gfx->showCursor(false); - _vm->_interface->setStatusText(""); - _vm->_interface->setSaveReminderState(0); - _vm->_interface->rememberMode(); - if (_cutAwayMode == kPanelVideo) - _vm->_interface->setMode(kPanelVideo); - else - _vm->_interface->setMode(kPanelCutaway); - _cutawayActive = true; + if (!_cutawayActive) { + _vm->_gfx->showCursor(false); + _vm->_interface->setStatusText(""); + _vm->_interface->setSaveReminderState(0); + _vm->_interface->rememberMode(); + if (_cutAwayMode == kPanelVideo) + _vm->_interface->setMode(kPanelVideo); + else + _vm->_interface->setMode(kPanelCutaway); + _cutawayActive = true; + } else { + // If another cutaway is up, start the next cutaway immediately + startImmediately = true; + } // Set the initial background and palette for the cutaway ResourceContext *context = _vm->_resource->getContext(GAME_RESOURCEFILE); |