diff options
| author | Bertrand Augereau | 2011-08-03 12:21:46 +0200 |
|---|---|---|
| committer | Bertrand Augereau | 2011-08-03 13:50:24 +0200 |
| commit | 7fd8895de62ad0421d8038cdb0618b493aecec1c (patch) | |
| tree | eef727899908906744fb6f79c5324547ce284726 | |
| parent | 52fef5a59949e915d1785c094dda64e2db5edea2 (diff) | |
| download | scummvm-rg350-7fd8895de62ad0421d8038cdb0618b493aecec1c.tar.gz scummvm-rg350-7fd8895de62ad0421d8038cdb0618b493aecec1c.tar.bz2 scummvm-rg350-7fd8895de62ad0421d8038cdb0618b493aecec1c.zip | |
DREAMWEB: 'allocatework' ported to C++
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 8 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 3 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/vgagrafx.cpp | 4 |
5 files changed, 7 insertions, 10 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 4e110bec04..f279473f34 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -80,6 +80,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'liftsprite', 'frameoutv', 'modifychar', + 'allocatework', 'lockmon', 'cancelch0', 'cancelch1', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 12126fce78..a43816153e 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -2999,13 +2999,6 @@ dumpevery2: goto dumpevery2; } -void DreamGenContext::allocatework() { - STACK_CHECK; - bx = 0x1000; - allocatemem(); - data.word(kWorkspace) = ax; -} - void DreamGenContext::loadpalfromiff() { STACK_CHECK; dx = 2481; @@ -20223,7 +20216,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) { case addr_getreelstart: getreelstart(); break; case addr_deleverything: deleverything(); break; case addr_dumpeverything: dumpeverything(); break; - case addr_allocatework: allocatework(); break; case addr_showpcx: showpcx(); break; case addr_loadpalfromiff: loadpalfromiff(); break; case addr_setmode: setmode(); break; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 264fece0b0..026ba1c3aa 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -637,7 +637,6 @@ public: static const uint16 addr_setmode = 0xc1dc; static const uint16 addr_loadpalfromiff = 0xc1d8; static const uint16 addr_showpcx = 0xc1cc; - static const uint16 addr_allocatework = 0xc1c8; static const uint16 addr_dumpeverything = 0xc1c4; static const uint16 addr_deleverything = 0xc1c0; static const uint16 addr_getreelstart = 0xc1b8; @@ -1819,7 +1818,7 @@ public: void afterintroroom(); void blockget(); void usetrainer(); - void allocatework(); + //void allocatework(); void addtopresslist(); void walkandexamine(); void dmaend(); diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index a8bcd019c5..ddcde72da6 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -21,6 +21,7 @@ */ uint16 allocatemem(uint16 paragraphs); uint8 *workspace(); + void allocatework(); void clearwork(); void multidump(); void multidump(uint16 x, uint16 y, uint8 width, uint8 height); diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index b0bfd12a8f..e61532fdb9 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -34,6 +34,10 @@ uint8 *DreamGenContext::workspace() { return result; } +void DreamGenContext::allocatework() { + data.word(kWorkspace) = allocatemem(0x1000); +} + void DreamGenContext::multiget() { multiget(di, bx, cl, ch); } |