diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 10 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 5 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/use.cpp | 8 |
5 files changed, 12 insertions, 13 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index af8d721acf..6c0a8489f8 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -286,6 +286,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'usetempcharset', 'disablepath', 'getbackfromob', + 'showfirstuse', ], skip_output = [ # These functions are processed but not output 'dreamweb', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 66eb46d152..e85f62ec16 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -8287,16 +8287,6 @@ void DreamGenContext::useelevator1() { data.byte(kGetback) = 1; } -void DreamGenContext::showfirstuse() { - STACK_CHECK; - getobtextstart(); - findnextcolon(); - findnextcolon(); - usetext(); - cx = 400; - hangonp(); -} - void DreamGenContext::useelevator3() { STACK_CHECK; showfirstuse(); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 69a1bbbb64..1f0eb688b3 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -253,7 +253,6 @@ public: static const uint16 addr_useelevator2 = 0xc69c; static const uint16 addr_useelevator4 = 0xc698; static const uint16 addr_useelevator3 = 0xc694; - static const uint16 addr_showfirstuse = 0xc690; static const uint16 addr_useelevator1 = 0xc68c; static const uint16 addr_usehandle = 0xc688; static const uint16 addr_usewire = 0xc684; @@ -1168,7 +1167,6 @@ public: void clearbuffers(); //void neterror(); void storeit(); - //void lockeddoorway(); //void isitworn(); //void putundertimed(); //void dumpmap(); @@ -1520,6 +1518,7 @@ public: void random(); void mainman(); void mansatstill(); + //void showfirstuse(); void channel1only(); //void checkbasemem(); void lastfolder(); @@ -1839,7 +1838,7 @@ public: void usewinch(); void setbotright(); //void readmouse3(); - void showfirstuse(); + //void lockeddoorway(); void setupemm(); void aide(); //void getmapad(); diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 2178ab90f8..6be62d1cce 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -340,4 +340,5 @@ void usetempcharset(); void usecharset1(); void getbackfromob(); + void showfirstuse(); diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp index b090cbbca7..4aeb35f70f 100644 --- a/engines/dreamweb/use.cpp +++ b/engines/dreamweb/use.cpp @@ -177,5 +177,13 @@ void DreamGenContext::usetext(const uint8 *string) { worktoscreenm(); } +void DreamGenContext::showfirstuse() { + uint8 *obText = getobtextstartCPP(); + findnextcolon(&obText); + findnextcolon(&obText); + usetext(obText); + hangonp(400); +} + } /*namespace dreamgen */ |