aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-09-20 23:35:10 +0000
committerJohannes Schickel2009-09-20 23:35:10 +0000
commit44359cd920b0b8e5591dacd002f1f6f62682d74d (patch)
tree555a5e9d83138d506958e4200d55128eaff59c77
parent8daf7fbba880ab2ae623a823a1ad3b5d2ba96d6a (diff)
downloadscummvm-rg350-44359cd920b0b8e5591dacd002f1f6f62682d74d.tar.gz
scummvm-rg350-44359cd920b0b8e5591dacd002f1f6f62682d74d.tar.bz2
scummvm-rg350-44359cd920b0b8e5591dacd002f1f6f62682d74d.zip
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.
svn-id: r44225
-rw-r--r--engines/cine/main_loop.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp
index 44e4e43a6c..47cade105c 100644
--- a/engines/cine/main_loop.cpp
+++ b/engines/cine/main_loop.cpp
@@ -382,7 +382,7 @@ void CineEngine::mainLoop(int bootScriptIdx) {
do {
manageEvents();
getMouseData(mouseUpdateStatus, &mouseButton, &dummyU16, &dummyU16);
- } while (mouseButton != 0);
+ } while (mouseButton != 0 && !shouldQuit());
menuVar = 0;
@@ -391,14 +391,14 @@ void CineEngine::mainLoop(int bootScriptIdx) {
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;
}