diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 9 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 5 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 4 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 |
5 files changed, 8 insertions, 12 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index f41fb5f87b..c4bcbb176c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -198,6 +198,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'findnextcolon', 'usetext', 'bresenhams', + 'examineobtext', ], skip_output = [ # These functions are processed but not output 'dreamweb', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 4ef2255949..a76a2697e3 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -14651,14 +14651,6 @@ void DreamGenContext::afterintroroom() { data.byte(kNowinnewroom) = 0; } -void DreamGenContext::examineobtext() { - STACK_CHECK; - bl = data.byte(kCommand); - bh = data.byte(kCommandtype); - al = 1; - commandwithob(); -} - void DreamGenContext::printmessage2() { STACK_CHECK; push(dx); @@ -17265,7 +17257,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) { case addr_atmospheres: atmospheres(); break; case addr_walkintoroom: walkintoroom(); break; case addr_afterintroroom: afterintroroom(); break; - case addr_examineobtext: examineobtext(); break; case addr_printmessage2: printmessage2(); break; case addr_setwalk: setwalk(); break; case addr_workoutframes: workoutframes(); break; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index ca2e089790..729b802b41 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -102,7 +102,6 @@ public: static const uint16 addr_workoutframes = 0xca54; static const uint16 addr_setwalk = 0xca44; static const uint16 addr_printmessage2 = 0xca30; - static const uint16 addr_examineobtext = 0xca20; static const uint16 addr_afterintroroom = 0xca14; static const uint16 addr_walkintoroom = 0xca10; static const uint16 addr_atmospheres = 0xca0c; @@ -1533,7 +1532,7 @@ public: //void finishedwalking(); void findinvpos(); void dumpmenu(); - void hangonpq(); + //void examineobtext(); void liftnoise(); void workoutframes(); void getbackfromob(); @@ -1654,7 +1653,7 @@ public: void loadnews(); void rollem(); //void makeworn(); - void examineobtext(); + void hangonpq(); void startup(); void savegame(); void startpaltoend(); diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 600df65b40..acba57ae87 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -1113,6 +1113,10 @@ void DreamGenContext::commandwithob(uint8 command, uint8 type, uint8 index) { data.byte(kNewtextline) = 1; } +void DreamGenContext::examineobtext() { + commandwithob(1, data.byte(kCommandtype), data.byte(kCommand)); +} + void DreamGenContext::showpanel() { Frame *frame = (Frame *)segRef(data.word(kIcons1)).ptr(0, sizeof(Frame)); showframe(frame, 72, 0, 19, 0); diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 595061676a..d25a8d13b7 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -244,5 +244,6 @@ void getblockofpixel(); uint8 getblockofpixel(uint8 x, uint8 y); void bresenhams(); + void examineobtext(); |