aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2012-01-20 17:22:54 +1100
committerStrangerke2012-04-06 08:20:15 +0200
commit7d6b859df58f5ac9cf126e50ff5b0c25cd57850a (patch)
tree97072ee9720839c5c236fa3f240371fd47c40399
parent412124baa66628c1d2b6804db0ce748b45e5a4cc (diff)
downloadscummvm-rg350-7d6b859df58f5ac9cf126e50ff5b0c25cd57850a.tar.gz
scummvm-rg350-7d6b859df58f5ac9cf126e50ff5b0c25cd57850a.tar.bz2
scummvm-rg350-7d6b859df58f5ac9cf126e50ff5b0c25cd57850a.zip
MORTEVIELLE: Added explicit quit checks to the main game loops
-rw-r--r--engines/mortevielle/mort.cpp1
-rw-r--r--engines/mortevielle/mouse.cpp3
-rw-r--r--engines/mortevielle/prog.cpp3
3 files changed, 7 insertions, 0 deletions
diff --git a/engines/mortevielle/mort.cpp b/engines/mortevielle/mort.cpp
index fc592f98fe..766ae3c429 100644
--- a/engines/mortevielle/mort.cpp
+++ b/engines/mortevielle/mort.cpp
@@ -142,6 +142,7 @@ void mortevielle_main() {
show_mouse();
do {
tjouer();
+ CHECK_QUIT;
} while (!arret);
}
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index 04b6c116e0..e79086ed2c 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -295,7 +295,10 @@ void mov_mouse(bool &funct, char &key) {
funct = false;
key = '\377';
p_key = keypressed();
+
while (p_key) {
+ CHECK_QUIT;
+
in1 = get_ch(); // input >> kbd >> in1;
read_pos_mouse(cx, cy, cd);
switch (toupper(in1)) {
diff --git a/engines/mortevielle/prog.cpp b/engines/mortevielle/prog.cpp
index 236e785199..41615219d4 100644
--- a/engines/mortevielle/prog.cpp
+++ b/engines/mortevielle/prog.cpp
@@ -30,6 +30,7 @@
#include "mortevielle/menu.h"
#include "mortevielle/mor.h"
#include "mortevielle/mor2.h"
+#include "mortevielle/mortevielle.h"
#include "mortevielle/prog.h"
#include "mortevielle/taffich.h"
#include "mortevielle/var_mor.h"
@@ -265,6 +266,7 @@ void tecran() {
mdn();
tinke();
mov_mouse(funct, inkey);
+ CHECK_QUIT;
temps = temps + 1;
} while (!((choisi) || (temps > lim) || (funct) || (anyone)));
@@ -348,6 +350,7 @@ void tjouer() {
antegame();
do {
tecran();
+ CHECK_QUIT;
} while (!((arret) || (solu) || (perdu)));
if (solu) tmaj1();
else if (perdu) tencore();