diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 14 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 3 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 7 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 |
5 files changed, 10 insertions, 16 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 020e3885ae..95fe7d0485 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -210,6 +210,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'convicons', 'examineob', 'showwatch', + 'dumpwatch', 'showtime', 'roomname', 'transfertext', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index d60a13b75b..b788ba8c69 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -12640,19 +12640,6 @@ void DreamGenContext::checkforshake() { data.byte(kShakecounter) = -1; } -void DreamGenContext::dumpwatch() { - STACK_CHECK; - _cmp(data.byte(kWatchdump), 1); - if (!flags.z()) - return /* (nodumpwatch) */; - di = 256; - bx = 21; - cl = 40; - ch = 12; - multidump(); - data.byte(kWatchdump) = 0; -} - void DreamGenContext::showbyte() { STACK_CHECK; dl = al; @@ -15353,7 +15340,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) { case addr_screenupdate: screenupdate(); break; case addr_watchreel: watchreel(); break; case addr_checkforshake: checkforshake(); break; - case addr_dumpwatch: dumpwatch(); break; case addr_showbyte: showbyte(); break; case addr_onedigit: onedigit(); break; case addr_showword: showword(); break; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index af5ac88852..c5e24b5d95 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -101,7 +101,6 @@ public: static const uint16 addr_showword = 0xc9c0; static const uint16 addr_onedigit = 0xc9b8; static const uint16 addr_showbyte = 0xc9b4; - static const uint16 addr_dumpwatch = 0xc9b0; static const uint16 addr_checkforshake = 0xc9a4; static const uint16 addr_watchreel = 0xc9a0; static const uint16 addr_screenupdate = 0xc99c; @@ -1424,7 +1423,7 @@ public: //void delthisone(); //void makebackob(); void middlepanel(); - void dumpwatch(); + //void dumpwatch(); void saveload(); void monitorlogo(); void loadposition(); diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 287f4ee459..cb6cc47129 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -2018,6 +2018,13 @@ void DreamGenContext::showwatch() { } } +void DreamGenContext::dumpwatch() { + if (data.byte(kWatchdump) != 1) + return; + multidump(256, 21, 40, 12); + data.byte(kWatchdump) = 0; +} + void DreamGenContext::showtime() { if (data.byte(kWatchon) == 0) return; diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 2babc891ce..88c28457f7 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -272,6 +272,7 @@ void convicons(); void examineob(bool examineAgain = true); void showwatch(); + void dumpwatch(); void showtime(); void roomname(); void transfertext(); |