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/events.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/events.cpp')
-rw-r--r-- | engines/xeen/events.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/xeen/events.cpp b/engines/xeen/events.cpp index bec5b6bd51..6ceef4406b 100644 --- a/engines/xeen/events.cpp +++ b/engines/xeen/events.cpp @@ -116,7 +116,7 @@ void EventsManager::clearEvents() { } void EventsManager::debounceMouse() { - while (_leftButton && !_vm->shouldQuit()) { + while (_leftButton && !_vm->shouldExit()) { pollEventsAndWait(); } } @@ -142,13 +142,13 @@ bool EventsManager::isKeyMousePressed() { } bool EventsManager::wait(uint numFrames, bool interruptable) { - while (!_vm->shouldQuit() && timeElapsed() < numFrames) { + while (!_vm->shouldExit() && timeElapsed() < numFrames) { pollEventsAndWait(); if (interruptable && (_leftButton || _rightButton || isKeyPending())) return true; } - return _vm->shouldQuit(); + return _vm->shouldExit(); } void EventsManager::ipause(uint amount) { @@ -156,13 +156,13 @@ void EventsManager::ipause(uint amount) { do { _vm->_interface->draw3d(true); pollEventsAndWait(); - } while (!_vm->shouldQuit() && timeElapsed() < amount); + } while (!_vm->shouldExit() && timeElapsed() < amount); } void EventsManager::ipause5(uint amount) { do { pollEventsAndWait(); - } while (!_vm->shouldQuit() && timeElapsed5() < amount); + } while (!_vm->shouldExit() && timeElapsed5() < amount); } void EventsManager::waitForPressAnimated() { @@ -172,9 +172,9 @@ void EventsManager::waitForPressAnimated() { updateGameCounter(); _vm->_interface->draw3d(true); - while (!_vm->shouldQuit() && timeElapsed() == 0) + while (!_vm->shouldExit() && timeElapsed() == 0) pollEventsAndWait(); - } while (!_vm->shouldQuit() && !isKeyMousePressed()); + } while (!_vm->shouldExit() && !isKeyMousePressed()); clearEvents(); } @@ -184,7 +184,7 @@ void EventsManager::waitForPress() { do { pollEventsAndWait(); - } while (!_vm->shouldQuit() && !isKeyMousePressed()); + } while (!_vm->shouldExit() && !isKeyMousePressed()); clearEvents(); } |