DREAMWEB: Fix quitting in several modal parts of the game

scummvm · Sep 8, 2011 · a2620d6 · a2620d6
1 parent b60a706
commit a2620d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
@@ -111,6 +111,8 @@ uint8 DreamGenContext::printslow(const uint8 *string, uint16 x, uint16 y, uint8
 				data.word(kCharshift) = 0;
 				for (int i=0; i<2; ++i) {
 					uint16 mouseState = waitframes();
+					if (data.byte(kQuitrequested))
+						return 0;
 					if (mouseState == 0)
 						continue;
 					if (mouseState != data.word(kOldbutton)) {

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
@@ -1855,6 +1855,8 @@ void DreamGenContext::hangon(uint16 frameCount) {
 	while (frameCount) {
 		vsync();
 		--frameCount;
+		if (data.byte(kQuitrequested))
+			break;
 	}
 }
 
@@ -1881,6 +1883,8 @@ void DreamGenContext::hangonp(uint16 count) {
 		showpointer();
 		vsync();
 		dumppointer();
+		if (data.byte(kQuitrequested))
+			break;
 		if (data.word(kMousebutton) == 0)
 			continue;
 		if (data.word(kMousebutton) != data.word(kOldbutton))