[Scummvm-cvs-logs] scummvm master -> 93173a11cad9f22978f573c9424b7e01971bf541

[digitall]

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:
93173a11ca DREAMWEB: Move 'wongame' flag out of data blob.


Commit: 93173a11cad9f22978f573c9424b7e01971bf541
    https://github.com/scummvm/scummvm/commit/93173a11cad9f22978f573c9424b7e01971bf541
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-27T16:04:12-08:00

Commit Message:
DREAMWEB: Move 'wongame' flag out of data blob.

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreambase.h
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/people.cpp
    engines/dreamweb/stubs.cpp



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index dad24bf..f934325 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -225,6 +225,7 @@ p = parser(skip_binary_data = [
 	'timer2',
 	'timer3',
 	'wholetimer',
+	'wongame',
 	'timer1to',
 	'timer2to',
 	'timer3to',
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index a9f8ee7..b9eee14 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -172,6 +172,8 @@ public:
 	bool _subtitles;
 	bool _foreignRelease;
 
+	bool _wonGame;
+
 	// sound related
 	uint8 _roomsSample;
 	uint8 _currentSample;
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f9262fb..79c3672 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -63,11 +63,11 @@ void DreamGenContext::__start() {
 		//0x00f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0100: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 
 		//0x0110: .... .... .... ....
-		0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, 0x00, };
+		0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f999c6f..9fada48 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -245,29 +245,28 @@ static const uint16 kVolume = 270;
 static const uint16 kVolumeto = 271;
 static const uint16 kVolumedirection = 272;
 static const uint16 kVolumecount = 273;
-static const uint16 kWongame = 274;
-static const uint16 kLasthardkey = 275;
-static const uint16 kBufferin = 276;
-static const uint16 kBufferout = 278;
-static const uint16 kWorkspace = 280;
-static const uint16 kMainsprites = 282;
-static const uint16 kBackdrop = 284;
-static const uint16 kRecordspace = 286;
-static const uint16 kBlinkframe = 288;
-static const uint16 kBlinkcount = 289;
-static const uint16 kReasseschanges = 290;
-static const uint16 kPointerspath = 291;
-static const uint16 kManspath = 292;
-static const uint16 kPointerfirstpath = 293;
-static const uint16 kFinaldest = 294;
-static const uint16 kDestination = 295;
-static const uint16 kLinestartx = 296;
-static const uint16 kLinestarty = 298;
-static const uint16 kLineendx = 300;
-static const uint16 kLineendy = 302;
-static const uint16 kLinepointer = 304;
-static const uint16 kLinedirection = 305;
-static const uint16 kLinelength = 306;
+static const uint16 kLasthardkey = 274;
+static const uint16 kBufferin = 275;
+static const uint16 kBufferout = 277;
+static const uint16 kWorkspace = 279;
+static const uint16 kMainsprites = 281;
+static const uint16 kBackdrop = 283;
+static const uint16 kRecordspace = 285;
+static const uint16 kBlinkframe = 287;
+static const uint16 kBlinkcount = 288;
+static const uint16 kReasseschanges = 289;
+static const uint16 kPointerspath = 290;
+static const uint16 kManspath = 291;
+static const uint16 kPointerfirstpath = 292;
+static const uint16 kFinaldest = 293;
+static const uint16 kDestination = 294;
+static const uint16 kLinestartx = 295;
+static const uint16 kLinestarty = 297;
+static const uint16 kLineendx = 299;
+static const uint16 kLineendy = 301;
+static const uint16 kLinepointer = 303;
+static const uint16 kLinedirection = 304;
+static const uint16 kLinelength = 305;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index ca7bf07..0e18303 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -178,8 +178,8 @@ void DreamBase::madman(ReelRoutine &routine) {
 		}
 		++newReelPointer;
 		if (newReelPointer == 294) {
-			if (data.byte(kWongame) != 1) {
-				data.byte(kWongame) = 1;
+			if (!_wonGame) {
+				_wonGame = true;
 				getRidOfTempText();
 			}
 			return;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index d61146e..8c4d738 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -482,7 +482,7 @@ void DreamBase::dreamweb() {
 	clearPalette();
 	set16ColPalette();
 	readSetData();
-	data.byte(kWongame) = 0;
+	_wonGame = false;
 
 	engine->loadSounds(0, "DREAMWEB.V99"); // basic sample
 
@@ -589,7 +589,7 @@ void DreamBase::dreamweb() {
 			if (_quitRequested)
 				goto done;
 
-			if (data.byte(kWongame) != 0) {
+			if (_wonGame) {
 				// "endofgame"
 				clearBeforeLoad();
 				fadeScreenDowns();
@@ -712,7 +712,7 @@ void DreamBase::screenUpdate() {
 	zoom();
 
 	showPointer();
-	if (data.byte(kWongame))
+	if (_wonGame)
 		return;
 	vSync();
 	mouseState |= readMouseState();