[Scummvm-cvs-logs] SF.net SVN: scummvm:[51324] scummvm/trunk/engines/kyra/kyra_v1.cpp

[lordhoto at users.sourceforge.net]

Revision: 51324
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51324&view=rev
Author:   lordhoto
Date:     2010-07-26 17:03:45 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
KYRA: Fix assertion when using "enter" to scene with instant death.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v1.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2010-07-26 16:49:04 UTC (rev 51323)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2010-07-26 17:03:45 UTC (rev 51324)
@@ -257,7 +257,7 @@
 	int keys = 0;
 	int8 mouseWheel = 0;
 
-	while (_eventList.size()) {
+	while (!_eventList.empty()) {
 		Common::Event event = *_eventList.begin();
 		bool breakLoop = false;
 
@@ -281,6 +281,7 @@
 				if (event.kbd.keycode == Common::KEYCODE_d) {
 					if (_debugger)
 						_debugger->attach();
+					breakLoop = true;
 				} else if (event.kbd.keycode == Common::KEYCODE_q) {
 					quitGame();
 				}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.