MORTEVIELLE: Added extra quit checks to event loops

scummvm · Apr 6, 2012 · ece9de0 · ece9de0
1 parent 418a78a
commit ece9de0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
@@ -1053,6 +1053,8 @@ void taller() {
 		tou = '\0';
 		do {
 			mov_mouse(f, tou);
+			CHECK_QUIT;
+
 			/*     if keypressed then read(kbd,tou);*/
 			read_pos_mouse(x, y, c);
 			x = x * (3 - res);

diff --git a/engines/mortevielle/alert.cpp b/engines/mortevielle/alert.cpp
@@ -195,6 +195,8 @@ int do_alert(Common::String str_, int n) {
 	do {
 		dumi = '\377';
 		mov_mouse(dum, dumi);
+		CHECK_QUIT0;
+
 		cx = x_s;
 		cy = y_s;
 		test = (cy > 95) && (cy < 105);

diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
@@ -628,6 +628,8 @@ void tfleche() {
 
 		do {
 			mov_mouse(qust, touch);
+			CHECK_QUIT;
+
 			if (g_vm->getMouseClick())
 				rect = (x_s < 256 * res) && (y_s < 176) && (y_s > 12);
 			tinke();

diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
@@ -85,6 +85,7 @@ class MortevielleEngine : public Engine {
 extern MortevielleEngine *g_vm;
 
 #define CHECK_QUIT if (g_vm->shouldQuit()) { return; }
+#define CHECK_QUIT0 if (g_vm->shouldQuit()) { return 0; }
 
 } // End of namespace Mortevielle
 

diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp
@@ -109,6 +109,8 @@ namespace Mortevielle {
 			g_vm->setMouseClick(false);
 			tesok = false;
 			mov_mouse(func, key);
+			CHECK_QUIT0;
+
 			k = 1;
 			while (coor[k].etat && ! dans_rect(coor[k]))  k = k + 1;
 			if (coor[k].etat) {