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/lure | |
| 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/lure')
| -rw-r--r-- | engines/lure/animseq.cpp | 2 | ||||
| -rw-r--r-- | engines/lure/events.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/lure/animseq.cpp b/engines/lure/animseq.cpp index f33c3307be..3d5265c90f 100644 --- a/engines/lure/animseq.cpp +++ b/engines/lure/animseq.cpp @@ -49,7 +49,7 @@ AnimAbortType AnimationSequence::delay(uint32 milliseconds) { else return ABORT_NEXT_SCENE; } else if (events.type() == Common::EVENT_LBUTTONDOWN) return ABORT_NEXT_SCENE; - else if (events.type() == Common::EVENT_QUIT) + else if ((events.type() == Common::EVENT_QUIT) || (events.type() == Common::EVENT_RTL)) return ABORT_END_INTRO; } diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp index ed1102e9b2..97da8bdb03 100644 --- a/engines/lure/events.cpp +++ b/engines/lure/events.cpp @@ -187,7 +187,7 @@ void Events::waitForPress() { bool keyButton = false; while (!keyButton) { while (pollEvent()) { - if (_event.type == Common::EVENT_QUIT) return; + if ((_event.type == Common::EVENT_QUIT) || (_event.type == Common::EVENT_RTL)) return; else if ((_event.type == Common::EVENT_KEYDOWN) && (_event.kbd.ascii != 0)) keyButton = true; else if ((_event.type == Common::EVENT_LBUTTONDOWN) || |