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/kyra | |
| 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/kyra')
| -rw-r--r-- | engines/kyra/sequences_lok.cpp | 1 | ||||
| -rw-r--r-- | engines/kyra/text_lok.cpp | 1 | ||||
| -rw-r--r-- | engines/kyra/vqa.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index 577dcd827b..77cfbed2d0 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -1185,6 +1185,7 @@ void KyraEngine_LoK::seq_playCredits() { case Common::EVENT_KEYDOWN: finished = true; break; + case Common::EVENT_RTL: case Common::EVENT_QUIT: finished = true; break; diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp index d452109f91..150ec59a23 100644 --- a/engines/kyra/text_lok.cpp +++ b/engines/kyra/text_lok.cpp @@ -120,6 +120,7 @@ void KyraEngine_LoK::waitForChatToFinish(int vocFile, int16 chatDuration, const if (event.kbd.keycode == '.') _skipFlag = true; break; + case Common::EVENT_RTL: case Common::EVENT_QUIT: runLoop = false; break; diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 9e2adfa71f..c55c573ea3 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -670,6 +670,7 @@ void VQAMovie::play() { if (event.kbd.ascii == 27) return; break; + case Common::EVENT_RTL: case Common::EVENT_QUIT: return; default: |