aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Augereau2011-08-17 06:51:29 +0200
committerBertrand Augereau2011-08-17 06:51:29 +0200
commite36832bbf84cba88fe6b17e1634fab0d550f13df (patch)
treeb255c21a2cffd7438804dfb98b5f68307afb82fd
parent681af21e2f7133d98af48345a3747f7574f555c3 (diff)
downloadscummvm-rg350-e36832bbf84cba88fe6b17e1634fab0d550f13df.tar.gz
scummvm-rg350-e36832bbf84cba88fe6b17e1634fab0d550f13df.tar.bz2
scummvm-rg350-e36832bbf84cba88fe6b17e1634fab0d550f13df.zip
DREAMWEB: Removal of unneeded stubs
-rwxr-xr-xdevtools/tasmrecover/tasm-recover2
-rw-r--r--engines/dreamweb/dreamgen.cpp20
-rw-r--r--engines/dreamweb/dreamgen.h8
-rw-r--r--engines/dreamweb/sprite.cpp5
-rw-r--r--engines/dreamweb/stubs.h1
5 files changed, 5 insertions, 31 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 4af00914d2..f216013f5c 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -115,6 +115,8 @@ generator = cpp(context, "DreamGen", blacklist = [
'madmantext',
'madmode',
'movemap',
+ 'doorway',
+ 'widedoor',
], skip_output = [
# These functions are processed but not output
'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ff15a3e7ac..9a5a27dff0 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2523,24 +2523,6 @@ gotconst:
ds.byte(di+17) = al;
}
-void DreamGenContext::doorway() {
- STACK_CHECK;
- data.byte(kDoorcheck1) = -24;
- data.byte(kDoorcheck2) = 10;
- data.byte(kDoorcheck3) = -30;
- data.byte(kDoorcheck4) = 10;
- dodoor();
-}
-
-void DreamGenContext::widedoor() {
- STACK_CHECK;
- data.byte(kDoorcheck1) = -24;
- data.byte(kDoorcheck2) = 24;
- data.byte(kDoorcheck3) = -30;
- data.byte(kDoorcheck4) = 24;
- dodoor();
-}
-
void DreamGenContext::reelsonscreen() {
STACK_CHECK;
reconstruct();
@@ -19049,8 +19031,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
case addr_random: random(); break;
case addr_steady: steady(); break;
case addr_constant: constant(); break;
- case addr_doorway: doorway(); break;
- case addr_widedoor: widedoor(); break;
case addr_reelsonscreen: reelsonscreen(); break;
case addr_soundonreels: soundonreels(); break;
case addr_reconstruct: reconstruct(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e5661aa866..e1071dfebc 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -624,8 +624,6 @@ public:
static const uint16 addr_reconstruct = 0xc1ac;
static const uint16 addr_soundonreels = 0xc1a8;
static const uint16 addr_reelsonscreen = 0xc1a0;
- static const uint16 addr_widedoor = 0xc18c;
- static const uint16 addr_doorway = 0xc188;
static const uint16 addr_constant = 0xc184;
static const uint16 addr_steady = 0xc180;
static const uint16 addr_random = 0xc17c;
@@ -1469,7 +1467,6 @@ public:
void disablesoundint();
void checkifset();
void showallex();
- //void showrain();
void openpoolboss();
void buttontwo();
//void usetimedtext();
@@ -1770,6 +1767,7 @@ public:
void scrollmonitor();
void setsoundoff();
void setpickup();
+ //void doorway();
void dropobject();
void printmessage();
void reexfromopen();
@@ -1808,7 +1806,7 @@ public:
void intro3text();
void allocatemem();
void sortoutmap();
- void doorway();
+ //void showrain();
void useopened();
void inventory();
void powerlightoff();
@@ -1877,7 +1875,7 @@ public:
//void clearsprites();
void obpicture();
void selectopenob();
- void widedoor();
+ //void widedoor();
void security();
//void printasprite();
void buttonfive();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 2fb52abe20..2129d1ca6d 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -200,11 +200,6 @@ void DreamGenContext::mainman(Sprite *sprite) {
es = pop();
}
-void DreamGenContext::walking() {
- Sprite *sprite = (Sprite *)es.ptr(bx, sizeof(Sprite));
- walking(sprite);
-}
-
void DreamGenContext::walking(Sprite *sprite) {
uint8 comp;
if (data.byte(kLinedirection) != 0) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9886e1b712..c4385613f6 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -81,7 +81,6 @@
void initman();
void mainman(Sprite *sprite);
void facerightway();
- void walking();
void walking(Sprite *sprite);
void autosetwalk();
void checkdest(const uint8 *roomsPaths);