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/agi/preagi_troll.cpp | |
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/agi/preagi_troll.cpp')
-rw-r--r-- | engines/agi/preagi_troll.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp index 418f174a94..beff721fda 100644 --- a/engines/agi/preagi_troll.cpp +++ b/engines/agi/preagi_troll.cpp @@ -59,6 +59,7 @@ bool Troll::getMenuSel(const char *szMenu, int *iSel, int nSel) { while (!_vm->quit()) { while (_vm->_system->getEventManager()->pollEvent(event)) { switch(event.type) { + case Common::EVENT_RTL: case Common::EVENT_QUIT: return 0; case Common::EVENT_MOUSEMOVE: @@ -203,6 +204,7 @@ void Troll::waitAnyKeyIntro() { for (;;) { while (_vm->_system->getEventManager()->pollEvent(event)) { switch(event.type) { + case Common::EVENT_RTL: case Common::EVENT_QUIT: case Common::EVENT_LBUTTONUP: case Common::EVENT_KEYDOWN: |