diff options
author | Nicola Mettifogo | 2007-10-27 21:29:38 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-10-27 21:29:38 +0000 |
commit | 9d14d74e8d763806afc7019ab5cdda4eab113a44 (patch) | |
tree | 30e9831cf13e049821fe51a12b19a1489c253d4a | |
parent | 9998620379bbf681afd85ae9732594d6cee4daa0 (diff) | |
download | scummvm-rg350-9d14d74e8d763806afc7019ab5cdda4eab113a44.tar.gz scummvm-rg350-9d14d74e8d763806afc7019ab5cdda4eab113a44.tar.bz2 scummvm-rg350-9d14d74e8d763806afc7019ab5cdda4eab113a44.zip |
Temporarily force quits when user presses exit key combination. A TODO comment has been added to places where behavior should be changed to allow the engine to exit gracefully.
svn-id: r29270
-rw-r--r-- | engines/parallaction/dialogue.cpp | 6 | ||||
-rw-r--r-- | engines/parallaction/parallaction.cpp | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp index 906a2c076e..6a5094e06b 100644 --- a/engines/parallaction/dialogue.cpp +++ b/engines/parallaction/dialogue.cpp @@ -124,8 +124,12 @@ uint16 DialogueManager::askPassword() { // FIXME: see comment for updateInput() if (!g_system->getEventManager()->pollEvent(e)) continue; - if (e.type == Common::EVENT_QUIT) + if (e.type == Common::EVENT_QUIT) { + // TODO: don't quit() here, just have caller routines to check + // on kEngineQuit and exit gracefully to allow the engine to shut down + _engineFlags |= kEngineQuit; g_system->quit(); + } if (e.type != Common::EVENT_KEYDOWN) continue; if (!isdigit(e.kbd.ascii)) continue; diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index abf67efb1c..57d98e2a33 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -242,6 +242,8 @@ uint16 Parallaction::updateInput() { break; case Common::EVENT_QUIT: + // TODO: don't quit() here, just have caller routines to check + // on kEngineQuit and exit gracefully to allow the engine to shut down _engineFlags |= kEngineQuit; g_system->quit(); break; @@ -273,7 +275,10 @@ void waitUntilLeftClick() { break; if (e.type == Common::EVENT_QUIT) { + // TODO: don't quit() here, just have caller routines to check + // on kEngineQuit and exit gracefully to allow the engine to shut down _engineFlags |= kEngineQuit; + g_system->quit(); break; } |