diff options
author | Bertrand Augereau | 2011-08-15 13:49:11 +0200 |
---|---|---|
committer | Bertrand Augereau | 2011-08-15 22:30:16 +0200 |
commit | 2dadf6ba19b61c4af20da31a81cdf31bd5d3e79c (patch) | |
tree | 21dd834741e24ae8fcb0fa0efb67e0987adca91a | |
parent | e78a5a2b08012dfe786da6d77abcc052436ace9c (diff) | |
download | scummvm-rg350-2dadf6ba19b61c4af20da31a81cdf31bd5d3e79c.tar.gz scummvm-rg350-2dadf6ba19b61c4af20da31a81cdf31bd5d3e79c.tar.bz2 scummvm-rg350-2dadf6ba19b61c4af20da31a81cdf31bd5d3e79c.zip |
DREAMWEB: 'getreelstart' is now only called from C++
-rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 11 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 3 | ||||
-rw-r--r-- | engines/dreamweb/sprite.cpp | 2 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 4 | ||||
-rw-r--r-- | engines/dreamweb/stubs.h | 2 |
6 files changed, 6 insertions, 17 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index b151c31bff..d256e44b36 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -106,6 +106,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'deltextline', 'doblocks', 'checkifperson', + 'getreelstart', ], skip_output = [ # These functions are processed but not output 'dreamweb', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 0fdc75be99..75fdad7b1e 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -2796,16 +2796,6 @@ notmaprightspec: data.byte(kNowinnewroom) = 1; } -void DreamGenContext::getreelstart() { - STACK_CHECK; - ax = data.word(kReelpointer); - cx = 40; - _mul(cx); - es = data.word(kReels); - si = ax; - _add(si, (0+(36*144))); -} - void DreamGenContext::deleverything() { STACK_CHECK; al = data.byte(kMapysize); @@ -19408,7 +19398,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) { case addr_soundonreels: soundonreels(); break; case addr_reconstruct: reconstruct(); break; case addr_movemap: movemap(); break; - case addr_getreelstart: getreelstart(); break; case addr_deleverything: deleverything(); break; case addr_dumpeverything: dumpeverything(); break; case addr_showpcx: showpcx(); break; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index f3a2a3090e..9a0e9e9629 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -625,7 +625,6 @@ public: static const uint16 addr_showpcx = 0xc1cc; static const uint16 addr_dumpeverything = 0xc1c4; static const uint16 addr_deleverything = 0xc1c0; - static const uint16 addr_getreelstart = 0xc1b8; static const uint16 addr_movemap = 0xc1b4; static const uint16 addr_reconstruct = 0xc1ac; static const uint16 addr_soundonreels = 0xc1a8; @@ -1324,7 +1323,7 @@ public: void readkey(); void louis(); void entrytexts(); - void getreelstart(); + //void getreelstart(); void buttonenter(); void checkinput(); //void crosshair(); diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index 0e69607295..9735ad01b6 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -537,7 +537,7 @@ Frame *DreamGenContext::findsourceCPP() { return result; } -Reel *DreamGenContext::getreelstartCPP() { +Reel *DreamGenContext::getreelstart() { Reel *reel = (Reel *)segRef(data.word(kReels)).ptr(kReellist + data.word(kReelpointer) * sizeof(Reel) * 8, sizeof(Reel)); return reel; } diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 5f0ed98447..ede63e0315 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -884,7 +884,7 @@ void DreamGenContext::dealwithspecial(uint8 firstParam, uint8 secondParam) { } void DreamGenContext::plotreel() { - Reel *reel = getreelstartCPP(); + Reel *reel = getreelstart(); while (true) { if (reel->x < 220) break; @@ -975,7 +975,7 @@ bool DreamGenContext::checkifperson(uint8 x, uint8 y) { if (people->b4 == 255) continue; data.word(kReelpointer) = people->w0(); - Reel *reel = getreelstartCPP(); + Reel *reel = getreelstart(); if (reel->frame() == 0xffff) ++reel; const Frame *frame = getreelframeax(reel->frame()); diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 395eac6081..9f39b373b2 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -112,7 +112,7 @@ void cancelch0(); void cancelch1(); void plotreel(); - Reel *getreelstartCPP(); + Reel *getreelstart(); void dealwithspecial(uint8 firstParam, uint8 secondParam); void zoom(); void crosshair(); |