diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index e6748a41966..453dba1e7d5 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -40,7 +40,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'frameoutnm', 'frameoutbh', 'frameoutfx', - 'cls', + 'cls', + 'clearwork', 'printundermon', 'kernchars', 'getnextword', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 15a48df4848..41a249942c2 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -3267,18 +3267,6 @@ void DreamGenContext::createpanel2() { showframe(); } -void DreamGenContext::clearwork() { - STACK_CHECK; - ax = 0x0; - es = data.word(kWorkspace); - di = 0; - cx = (200*320)/64; -clearloop: - _stosw(32); - if (--cx) - goto clearloop; -} - void DreamGenContext::zoom() { STACK_CHECK; _cmp(data.word(kWatchingtime), 0); @@ -20347,7 +20335,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) { case addr_pixelcheckset: pixelcheckset(); break; case addr_createpanel: createpanel(); break; case addr_createpanel2: createpanel2(); break; - case addr_clearwork: clearwork(); break; case addr_vsync: vsync(); break; case addr_doshake: doshake(); break; case addr_zoom: zoom(); break; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 9f987893fe7..e2caf43107e 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -628,7 +628,6 @@ public: static const uint16 addr_zoom = 0xc210; static const uint16 addr_doshake = 0xc20c; static const uint16 addr_vsync = 0xc208; - static const uint16 addr_clearwork = 0xc204; static const uint16 addr_createpanel2 = 0xc200; static const uint16 addr_createpanel = 0xc1fc; static const uint16 addr_pixelcheckset = 0xc1f8; @@ -1367,7 +1366,7 @@ public: void turnanypathoff(); void openfilefromc(); void gettime(); - void clearwork(); + //void clearwork(); void loadtraveltext(); //void worktoscreen(); void getexpos(); diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index c218707d9bd..01dcbde3497 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -21,6 +21,7 @@ */ uint16 allocatemem(uint16 paragraphs); uint8 *workspace(); + void clearwork(); void multidump(); void multidump(uint16 x, uint16 y, uint8 width, uint8 height); void frameoutv(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y); diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index e1622d69afd..b0bfd12a8fd 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -379,5 +379,9 @@ void DreamGenContext::showframe() { ch = height; } +void DreamGenContext::clearwork() { + memset(workspace(), 0, 320*200); +} + } /*namespace dreamgen */