[Scummvm-cvs-logs] SF.net SVN: scummvm:[44230] scummvm/trunk/engines/cine/various.cpp

[lordhoto at users.sourceforge.net]

Revision: 44230
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44230&view=rev
Author:   lordhoto
Date:     2009-09-21 01:15:11 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
Add more shouldQuit checks in event loops.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/various.cpp

Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2009-09-21 01:14:50 UTC (rev 44229)
+++ scummvm/trunk/engines/cine/various.cpp	2009-09-21 01:15:11 UTC (rev 44230)
@@ -694,7 +694,7 @@
 	do {
 		manageEvents();
 		getMouseData(mouseUpdateStatus, &button, &dummyU16, &dummyU16);
-	} while (button);
+	} while (button && !g_cine->shouldQuit());
 
 	var_A = 0;
 
@@ -764,7 +764,7 @@
 //			}
 		}
 
-	} while (!var_A);
+	} while (!var_A && !g_cine->shouldQuit());
 
 	assert(!needMouseSave);
 
@@ -775,7 +775,7 @@
 	do {
 		manageEvents();
 		getMouseData(mouseUpdateStatus, &button, &dummyU16, &dummyU16);
-	} while (button);
+	} while (button && !g_cine->shouldQuit());
 
 	if (var_4 == 2)	{	// recheck
 		if (!recheckValue)
@@ -860,7 +860,7 @@
 					do {
 						manageEvents();
 						getMouseData(mouseUpdateStatus, &mouseButton, &dummyU16, &dummyU16);
-					} while (mouseButton);
+					} while (mouseButton && !g_cine->shouldQuit());
 
 					si = getObjectUnderCursor(mouseX,
 					    mouseY);
@@ -976,7 +976,7 @@
 		di = 0;
 		getMouseData(mouseUpdateStatus, &mouseButton, &mouseX, &mouseY);
 
-		while (mouseButton) {
+		while (mouseButton && !g_cine->shouldQuit()) {
 			if (mouseButton & 1) {
 				di |= 1;
 			}
@@ -1619,7 +1619,7 @@
 
 		getMouseData(0, &mouseButton, &mouseX, &mouseY);
 
-		if (mouseButton & 2)
+		if ((mouseButton & 2) || g_cine->shouldQuit())
 			quit = 2;
 		else if (mouseButton & 1)
 			quit = 1;


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