[Scummvm-cvs-logs] scummvm master -> 9141df3bec3a40033416223d88d09a9835cd8b75

tramboi bertrand_augereau at yahoo.fr
Mon Nov 21 17:58:25 CET 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:
9141df3bec DREAMWEB: Misc cleanings in saveload.cpp


Commit: 9141df3bec3a40033416223d88d09a9835cd8b75
    https://github.com/scummvm/scummvm/commit/9141df3bec3a40033416223d88d09a9835cd8b75
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-21T08:56:49-08:00

Commit Message:
DREAMWEB: Misc cleanings in saveload.cpp

Changed paths:
    engines/dreamweb/saveload.cpp



diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 6b54da9..0fcd1b5 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -31,8 +31,7 @@ namespace DreamGen {
 void DreamGenContext::loadgame() {
 	if (data.byte(kCommandtype) != 246) {
 		data.byte(kCommandtype) = 246;
-		al = 41;
-		commandonly();
+		commandonly(41);
 	}
 	if (data.word(kMousebutton) == data.word(kOldbutton))
 		return; // "noload"
@@ -62,8 +61,8 @@ void DreamGenContext::doload() {
 		data.byte(kGetback) = 0;
 
 		while (true) {
-			if (data.byte(kQuitrequested))
-				return; // "quitloaded"
+			if (quitRequested())
+				return;
 			delpointer();
 			readmouse();
 			showpointer();
@@ -185,8 +184,7 @@ void DreamGenContext::savegame() {
 
 	if (data.byte(kCommandtype) != 247) {
 		data.byte(kCommandtype) = 247;
-		al = 44;
-		commandonly();
+		commandonly(44);
 	}
 	if (data.word(kMousebutton) != 1)
 		return;
@@ -206,9 +204,8 @@ void DreamGenContext::savegame() {
 		data.byte(kGetback) = 0;
 
 		while (true) {
-			_cmp(data.byte(kQuitrequested),  0);
-			if (!flags.z())
-				return /* (quitsavegame) */;
+			if (quitRequested())
+				return;
 			delpointer();
 			checkinput();
 			readmouse();






More information about the Scummvm-git-logs mailing list