aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/scene.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-02-14 16:54:47 -0500
committerPaul Gilbert2015-02-14 16:54:47 -0500
commitd31e602add7e5466754d4b651ce7f947f6effdda (patch)
tree4499c99675bdcf4a99411adf0731c9075ccc0704 /engines/mads/scene.cpp
parent1aa9181466d1916824abb7301ea3e67781d08183 (diff)
downloadscummvm-rg350-d31e602add7e5466754d4b651ce7f947f6effdda.tar.gz
scummvm-rg350-d31e602add7e5466754d4b651ce7f947f6effdda.tar.bz2
scummvm-rg350-d31e602add7e5466754d4b651ce7f947f6effdda.zip
MADS: Allow Escape key to close game options dialog
Diffstat (limited to 'engines/mads/scene.cpp')
-rw-r--r--engines/mads/scene.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index ea3fe2c148..61db1a6a32 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -592,12 +592,14 @@ void Scene::doSceneStep() {
}
void Scene::checkKeyboard() {
- if (_vm->_events->isKeyPressed()) {
- Common::Event evt = _vm->_events->_pendingKeys.pop();
+ EventsManager &events = *_vm->_events;
+
+ if (events.isKeyPressed()) {
+ Common::KeyState evt = events.getKey();
_vm->_game->handleKeypress(evt);
}
- if ((_vm->_events->_mouseStatus & 3) == 3 && _vm->_game->_player._stepEnabled) {
+ if ((events._mouseStatus & 3) == 3 && _vm->_game->_player._stepEnabled) {
_reloadSceneFlag = true;
_vm->_dialogs->_pendingDialog = DIALOG_GAME_MENU;
_action.clear();