diff options
| author | Johannes Schickel | 2010-07-26 17:03:45 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-07-26 17:03:45 +0000 |
| commit | 3c0765ae7849a9ca9962c5a3c6c83c5bcae506f8 (patch) | |
| tree | 9d25dd95ba202df3c186f00374506cfe46956d90 | |
| parent | 18a54f086f4b1e0edb16a887cc1a556b4ca86fb6 (diff) | |
| download | scummvm-rg350-3c0765ae7849a9ca9962c5a3c6c83c5bcae506f8.tar.gz scummvm-rg350-3c0765ae7849a9ca9962c5a3c6c83c5bcae506f8.tar.bz2 scummvm-rg350-3c0765ae7849a9ca9962c5a3c6c83c5bcae506f8.zip | |
KYRA: Fix assertion when using "enter" to scene with instant death.
svn-id: r51324
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 1c9a583167..5db2c360d6 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -257,7 +257,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag) int keys = 0; int8 mouseWheel = 0; - while (_eventList.size()) { + while (!_eventList.empty()) { Common::Event event = *_eventList.begin(); bool breakLoop = false; @@ -281,6 +281,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag) if (event.kbd.keycode == Common::KEYCODE_d) { if (_debugger) _debugger->attach(); + breakLoop = true; } else if (event.kbd.keycode == Common::KEYCODE_q) { quitGame(); } |