diff options
| author | Christopher Page | 2008-07-16 04:22:56 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-07-16 04:22:56 +0000 |
| commit | 7f480ac571f978802a3ecd5cf6169d0271d1f561 (patch) | |
| tree | dcd550f0c84bec20aa3cfe5ffc4604a51f174ef6 /engines/queen | |
| parent | 7ecd54a9da6b9a14b4f16c3e53f87475d43bc2da (diff) | |
| download | scummvm-rg350-7f480ac571f978802a3ecd5cf6169d0271d1f561.tar.gz scummvm-rg350-7f480ac571f978802a3ecd5cf6169d0271d1f561.tar.bz2 scummvm-rg350-7f480ac571f978802a3ecd5cf6169d0271d1f561.zip | |
Quit and RTL code is more modular now. EVENT_RTL no longer sets _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT. EVENT_RTL and EVENT_QUIT are completely separate from each other. Engine::quit() method now checks both _shouldQuit and _shouldRTL to determine if the engine should exit. There is no longer a need for resetQuit(), so it's removed
svn-id: r33082
Diffstat (limited to 'engines/queen')
| -rw-r--r-- | engines/queen/input.cpp | 2 | ||||
| -rw-r--r-- | engines/queen/journal.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index e7fcf84959..84e21fbcaa 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -118,7 +118,7 @@ void Input::delay(uint amount) { case Common::EVENT_RBUTTONDOWN: _mouseButton |= MOUSE_RBUTTON; break; - + case Common::EVENT_RTL: case Common::EVENT_QUIT: if (_cutawayRunning) _cutawayQuit = true; diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index c0bd3837c1..ead759cdb6 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -84,6 +84,7 @@ void Journal::use() { case Common::EVENT_WHEELDOWN: handleMouseWheel(1); break; + case Common::EVENT_RTL: case Common::EVENT_QUIT: return; default: |
