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

[bluegr]

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:
ed72efe05b DREAMWEB: Remove more global variables


Commit: ed72efe05bab195fcc9f637018c7b73316fb1a58
    https://github.com/scummvm/scummvm/commit/ed72efe05bab195fcc9f637018c7b73316fb1a58
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-27T19:47:09-08:00

Commit Message:
DREAMWEB: Remove more global variables

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a881609..51e7ce9 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -493,6 +493,13 @@ p = parser(skip_binary_data = [
 	'lenofmapstore',	# defined in dreambase.h
 	'keypadx',
 	'keypady',
+	'settext',
+	'freetext',
+	'setdatlen',
+	'textstart',
+	'maplen',
+	'maplength',
+	'undertimedysize',
 	# vgagrafx.asm
 	'cityname',
 	'extragraphics1',
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e27fc11..7d8e2ea 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -99,17 +99,15 @@ static const uint16 kSettextdat = (0);
 static const uint16 kTextunder = (0);
 static const uint16 kSpanish = (0);
 static const uint16 kRecording = (0);
+static const uint16 kExframedata = (0);
 static const uint16 kGerman = (0);
 static const uint16 kPathdata = (0);
 static const uint16 kDemo = (0);
 static const uint16 kFramedata = (0);
 static const uint16 kFlags = (0);
-static const uint16 kExframedata = (0);
 static const uint16 kIntextdat = (0);
 static const uint16 kFreetextdat = (0);
 static const uint16 kFrframedata = (0);
-static const uint16 kSettext = (0+(130*2));
-static const uint16 kFreetext = (0+(82*2));
 static const uint16 kExframes = (0+2080);
 static const uint16 kExdata = (0+2080+30000);
 static const uint16 kExtextdat = (0+2080+30000+(16*114));
@@ -122,7 +120,6 @@ static const uint16 kZoomy = (132);
 static const uint16 kFreedatlen = (16*80);
 static const uint16 kExtextlen = (18000);
 static const uint16 kNumchanges = (250);
-static const uint16 kUndertimedysize = (30);
 static const uint16 kExframeslen = (30000);
 static const uint16 kScreenwidth = (320);
 static const uint16 kItempicsize = (44);
@@ -132,12 +129,8 @@ static const uint16 kSymboly = (56);
 static const uint16 kInventy = (58);
 static const uint16 kMenuy = (60);
 static const uint16 kOpsx = (60);
-static const uint16 kMaplength = (60);
 static const uint16 kSymbolx = (64);
-static const uint16 kSetdatlen = (64*128);
 static const uint16 kMapwidth = (66);
-static const uint16 kTextstart = (66*2);
-static const uint16 kMaplen = (66*60);
 static const uint16 kDiaryx = (68+24);
 static const uint16 kLengthofvars = (68-0);
 static const uint16 kZoomx = (8);
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 57e9c9c..7dc605c 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -585,6 +585,9 @@ void DreamBase::purgeALocation(uint8 index) {
 }
 
 const uint8 *DreamBase::getObTextStart() {
+	const uint16 kSettext = 130*2;
+	const uint16 kFreetext = 82*2;
+
 	const uint8 *textBase;
 	const uint8 *text;
 	uint16 textOff;
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 096333f..d5617da 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1092,8 +1092,9 @@ void DreamBase::soundOnReels(uint16 reelPointer) {
 }
 
 void DreamBase::clearBeforeLoad() {
+	const uint16 kMaplen = 66*60;
 	if (_roomLoaded != 1)
-		return /* (noclear) */;
+		return; // noclear
 
 	clearReels();
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6eaf8fb..edd41be 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -960,6 +960,7 @@ void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8
 }
 
 void DreamBase::dumpTimedText() {
+	const uint16 kUndertimedysize = 30;
 	if (_needToDumpTimed != 1)
 		return;
 	uint8 y = _timedY;
@@ -1888,6 +1889,7 @@ void DreamBase::zoomOnOff() {
 }
 
 void DreamBase::sortOutMap() {
+	const uint16 kMaplength = 60;
 	const uint8 *src = workspace();
 	uint8 *dst = _mapData;
 	for (uint16 y = 0; y < kMaplength; ++y) {
@@ -2148,6 +2150,8 @@ void DreamBase::getRidOfAll() {
 
 // if skipDat, skip clearing and loading Setdat and Freedat
 void DreamBase::loadRoomData(const Room &room, bool skipDat) {
+	const uint16 kSetdatlen = 64*128;
+
 	engine->openFile(room.name);
 
 	FileHeader header;