aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-12-28 05:27:16 +0200
committerFilippos Karapetis2011-12-28 05:27:16 +0200
commit1d4337ebb5ca48ea031641533225d0e0b286d8c6 (patch)
treee420a2d12073f41deb36891257f6e60a9074f89a
parent749c82b95152b61289fff6fe30086924eace59d9 (diff)
downloadscummvm-rg350-1d4337ebb5ca48ea031641533225d0e0b286d8c6.tar.gz
scummvm-rg350-1d4337ebb5ca48ea031641533225d0e0b286d8c6.tar.bz2
scummvm-rg350-1d4337ebb5ca48ea031641533225d0e0b286d8c6.zip
DREAMWEB: Remove some unused globals
-rwxr-xr-xdevtools/tasmrecover/tasm-recover16
-rw-r--r--engines/dreamweb/dreamgen.h15
-rw-r--r--engines/dreamweb/keypad.cpp3
3 files changed, 19 insertions, 15 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index ee74b90fa2..a881609d38 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -477,6 +477,22 @@ p = parser(skip_binary_data = [
'initialvars',
'lengthofbuffer',
'lenofreelrouts',
+ 'reellist',
+ 'intext',
+ 'lengthofmap',
+ 'blocktext',
+ 'blocks',
+ 'frframes',
+ 'frames',
+ 'persontxtdat',
+ 'persontext',
+ 'tablesize',
+ 'undertextsizex', # defined in dreambase.h
+ 'undertextsizey', # defined in dreambase.h
+ #'lengthofvars', # kept to verify savegame validity
+ 'lenofmapstore', # defined in dreambase.h
+ 'keypadx',
+ 'keypady',
# vgagrafx.asm
'cityname',
'extragraphics1',
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e47c44a83a..e27fc111c1 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -109,36 +109,22 @@ 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 kReellist = (0+(36*144));
-static const uint16 kIntext = (0+(38*2));
-static const uint16 kLengthofmap = (0+(66*60));
static const uint16 kFreetext = (0+(82*2));
-static const uint16 kBlocktext = (0+(98*2));
-static const uint16 kBlocks = (0+192);
-static const uint16 kFrframes = (0+2080);
static const uint16 kExframes = (0+2080);
-static const uint16 kFrames = (0+2080);
static const uint16 kExdata = (0+2080+30000);
static const uint16 kExtextdat = (0+2080+30000+(16*114));
static const uint16 kExtext = (0+2080+30000+(16*114)+((114+2)*2));
static const uint16 kLengthofextra = (0+2080+30000+(16*114)+((114+2)*2)+18000);
-static const uint16 kPersontxtdat = (0+24);
-static const uint16 kPersontext = (0+24+(1026*2));
static const uint16 kForeign = (1);
static const uint16 kCd = (1);
static const uint16 kNumexobjects = (114);
-static const uint16 kUndertextsizey = (13);
static const uint16 kZoomy = (132);
static const uint16 kFreedatlen = (16*80);
static const uint16 kExtextlen = (18000);
-static const uint16 kLenofmapstore = (22*8*20*8);
-static const uint16 kUndertextsizex = (228);
static const uint16 kNumchanges = (250);
static const uint16 kUndertimedysize = (30);
static const uint16 kExframeslen = (30000);
-static const uint16 kTablesize = (32);
static const uint16 kScreenwidth = (320);
-static const uint16 kKeypadx = (36+112);
static const uint16 kItempicsize = (44);
static const uint16 kDiaryy = (48+12);
static const uint16 kOpsy = (52);
@@ -154,7 +140,6 @@ 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 kKeypady = (72);
static const uint16 kZoomx = (8);
static const uint16 kInventx = (80);
static const uint16 kMenux = (80+40);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 5ef6ba70d4..34f33ae128 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -24,6 +24,9 @@
namespace DreamGen {
+const uint16 kKeypadx = 36+112;
+const uint16 kKeypady = 72;
+
void DreamBase::getUnderMenu() {
multiGet(_underTimedText, kMenux, kMenuy, 48, 48);
}