diff options
author | Paul Gilbert | 2018-02-11 21:16:23 -0500 |
---|---|---|
committer | Paul Gilbert | 2018-02-11 21:16:23 -0500 |
commit | 7f50c5040144627cf00ccd91831946c356c45860 (patch) | |
tree | bcaf479a3b1768e59be82d7d708c0646505d3dea /engines/xeen/interface.cpp | |
parent | 3ce418a1de564636d6d9b2c1f5e13df9dbc4a819 (diff) | |
download | scummvm-rg350-7f50c5040144627cf00ccd91831946c356c45860.tar.gz scummvm-rg350-7f50c5040144627cf00ccd91831946c356c45860.tar.bz2 scummvm-rg350-7f50c5040144627cf00ccd91831946c356c45860.zip |
XEEN: Fix exiting to main menu after playing ending cutscenes
Diffstat (limited to 'engines/xeen/interface.cpp')
-rw-r--r-- | engines/xeen/interface.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp index 456a7879b4..b3508693d8 100644 --- a/engines/xeen/interface.cpp +++ b/engines/xeen/interface.cpp @@ -306,7 +306,7 @@ void Interface::perform() { } if (eventsFlag) { scripts.checkEvents(); - if (_vm->shouldQuit()) + if (_vm->shouldExit()) return; } } @@ -316,7 +316,7 @@ void Interface::perform() { // Show control panel combat._moveMonsters = false; ControlPanel::show(_vm); - if (!g_vm->shouldQuit() && !g_vm->_quitMode) + if (!g_vm->shouldExit() && !g_vm->_quitMode) combat._moveMonsters = true; break; @@ -1056,19 +1056,19 @@ void Interface::rest() { screen.fadeIn(); events.updateGameCounter(); - while (!_vm->shouldQuit() && events.timeElapsed() < 7) + while (!_vm->shouldExit() && events.timeElapsed() < 7) events.pollEventsAndWait(); sound.playSound("dreams2.voc", 1); - while (!_vm->shouldQuit() && sound.isPlaying()) + while (!_vm->shouldExit() && sound.isPlaying()) events.pollEventsAndWait(); sound.playSound("laff1.voc", 1); - while (!_vm->shouldQuit() && sound.isPlaying()) + while (!_vm->shouldExit() && sound.isPlaying()) events.pollEventsAndWait(); events.updateGameCounter(); - while (!_vm->shouldQuit() && events.timeElapsed() < 7) + while (!_vm->shouldExit() && events.timeElapsed() < 7) events.pollEventsAndWait(); screen.fadeOut(); @@ -1525,7 +1525,7 @@ void Interface::doCombat() { w.open(); bool breakFlag = false; - while (!_vm->shouldQuit() && !breakFlag) { + while (!_vm->shouldExit() && !breakFlag) { highlightChar(combat._whosTurn); combat.setSpeedTable(); @@ -1550,9 +1550,9 @@ void Interface::doCombat() { do { events.pollEventsAndWait(); checkEvents(_vm); - } while (!_vm->shouldQuit() && events.timeElapsed() < 1 && !_buttonValue); - } while (!_vm->shouldQuit() && !_buttonValue); - if (_vm->shouldQuit()) + } while (!_vm->shouldExit() && events.timeElapsed() < 1 && !_buttonValue); + } while (!_vm->shouldExit() && !_buttonValue); + if (_vm->shouldExit()) return; switch (_buttonValue) { |