[Scummvm-cvs-logs] scummvm master -> a2620d6edfb5beef2eb4ae6c9f855f46ece6ae42

tramboi bertrand_augereau at yahoo.fr
Thu Sep 8 09:16:09 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a2620d6edf DREAMWEB: Fix quitting in several modal parts of the game


Commit: a2620d6edfb5beef2eb4ae6c9f855f46ece6ae42
    https://github.com/scummvm/scummvm/commit/a2620d6edfb5beef2eb4ae6c9f855f46ece6ae42
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-09-08T00:11:16-07:00

Commit Message:
DREAMWEB: Fix quitting in several modal parts of the game

Changed paths:
    engines/dreamweb/print.cpp
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 4c9f0e6..edaf8ee 100644
--- 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
index f9eb409..600df65 100644
--- 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))






More information about the Scummvm-git-logs mailing list