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

[lordhoto at users.sourceforge.net]

Revision: 44225
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44225&view=rev
Author:   lordhoto
Date:     2009-09-20 23:35:10 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
Add some shouldQuit() checks in event loops. This makes it possible to easily quit ScummVM (or doing an RTL), when failing the copy protection in Future Wars for example.

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

Modified: scummvm/trunk/engines/cine/main_loop.cpp
===================================================================
--- scummvm/trunk/engines/cine/main_loop.cpp	2009-09-20 23:34:48 UTC (rev 44224)
+++ scummvm/trunk/engines/cine/main_loop.cpp	2009-09-20 23:35:10 UTC (rev 44225)
@@ -382,7 +382,7 @@
 			do {
 				manageEvents();
 				getMouseData(mouseUpdateStatus, &mouseButton, &dummyU16, &dummyU16);
-			} while (mouseButton != 0);
+			} while (mouseButton != 0 && !shouldQuit());
 
 			menuVar = 0;
 
@@ -391,14 +391,14 @@
 				getMouseData(mouseUpdateStatus, &mouseButton, &dummyU16, &dummyU16);
 				playerAction = (mouseButton != 0) || processKeyboard(menuVar);
 				mainLoopSub6();
-			} while (!playerAction);
+			} while (!playerAction && !shouldQuit());
 
 			menuVar = 0;
 
 			do {
 				manageEvents();
 				getMouseData(mouseUpdateStatus, &mouseButton, &dummyU16, &dummyU16);
-			} while (mouseButton != 0);
+			} while (mouseButton != 0 && !shouldQuit());
 
 			waitForPlayerClick = 0;
 		}


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