diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 11 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 7 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 6 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 |
5 files changed, 11 insertions, 15 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 57890688b7..7f7947a9f6 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -66,6 +66,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showframe', 'initman', 'aboutturn', + 'readheader', 'getroomdata', 'startloading', 'showreelframe', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 9436480b53..43a1ee3ee8 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -19563,16 +19563,6 @@ lookx: data.byte(kRoomnum) = cl; } -void DreamGenContext::readheader() { - STACK_CHECK; - ds = cs; - dx = 6091; - cx = (6187-6091); - readfromfile(); - es = cs; - di = 6141; -} - void DreamGenContext::allocateload() { STACK_CHECK; push(es); @@ -20942,7 +20932,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) { case addr_disablepath: disablepath(); break; case addr_findxyfrompath: findxyfrompath(); break; case addr_findroominloc: findroominloc(); break; - case addr_readheader: readheader(); break; case addr_dontloadseg: dontloadseg(); break; case addr_allocateload: allocateload(); break; case addr_fillspace: fillspace(); break; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 83e0a3f005..75ca47e460 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -60,7 +60,6 @@ public: static const uint16 addr_fillspace = 0xcb6c; static const uint16 addr_allocateload = 0xcb68; static const uint16 addr_dontloadseg = 0xcb64; - static const uint16 addr_readheader = 0xcb60; static const uint16 addr_findroominloc = 0xcb58; static const uint16 addr_findxyfrompath = 0xcb54; static const uint16 addr_disablepath = 0xcb50; @@ -1314,7 +1313,7 @@ public: void bothchannels(); void usewire(); void getnamepos(); - void drawitall(); + void loadtemptext(); void clearstartpal(); void femalefan(); void showgamereel(); @@ -1702,7 +1701,7 @@ public: void getridofpit(); void convnum(); void nothelderror(); - void readheader(); + //void readheader(); void getsetad(); void getyad(); void reconstruct(); @@ -1804,7 +1803,7 @@ public: void printmessage(); void reexfromopen(); void fillryan(); - void loadtemptext(); + void drawitall(); void usestereo(); void showcurrentfile(); void copyname(); diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index e16795c6db..2b330c831f 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -660,6 +660,12 @@ void DreamGenContext::startloading() { startloading(room); } +void DreamGenContext::readheader() { + ax = engine->readFromFile(cs.ptr(kFileheader, kHeaderlen), kHeaderlen); + es = cs; + di = kFiledata; +} + void DreamGenContext::startloading(const Room *room) { data.byte(kCombatcount) = 0; data.byte(kRoomssample) = room->roomsSample; diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 29b73acb47..fc3b7c9127 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -58,6 +58,7 @@ uint8 kernchars(uint8 firstChar, uint8 secondChar, uint8 width); void getroomdata(); void getroomdata(uint8 roomIndex); + void readheader(); void startloading(); void startloading(const Room *room); Sprite *spritetable(); |