diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 14 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 3 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 2 | ||||
| -rw-r--r-- | engines/dreamweb/vgagrafx.cpp | 4 |
5 files changed, 7 insertions, 17 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index b76edfe351..bc138cf49f 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -166,6 +166,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'drawflags', 'addtopeoplelist', 'getexpos', + 'paneltomap', ], skip_output = [ # These functions are processed but not output 'dreamweb', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index d2a9651267..6ebb617f7e 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -2657,19 +2657,6 @@ nought: goto palloop; } -void DreamGenContext::paneltomap() { - STACK_CHECK; - di = data.word(kMapxstart); - _add(di, data.word(kMapadx)); - bx = data.word(kMapystart); - _add(bx, data.word(kMapady)); - ds = data.word(kMapstore); - si = 0; - cl = data.byte(kMapxsize); - ch = data.byte(kMapysize); - multiget(); -} - void DreamGenContext::maptopanel() { STACK_CHECK; di = data.word(kMapxstart); @@ -17849,7 +17836,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) { case addr_showpcx: showpcx(); break; case addr_loadpalfromiff: loadpalfromiff(); break; case addr_setmode: setmode(); break; - case addr_paneltomap: paneltomap(); break; case addr_maptopanel: maptopanel(); break; case addr_dumpmap: dumpmap(); break; case addr_pixelcheckset: pixelcheckset(); break; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index f80c2ebaf2..8cf0462d74 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -568,7 +568,6 @@ public: static const uint16 addr_pixelcheckset = 0xc1f8; static const uint16 addr_dumpmap = 0xc1f4; static const uint16 addr_maptopanel = 0xc1f0; - static const uint16 addr_paneltomap = 0xc1ec; static const uint16 addr_setmode = 0xc1dc; static const uint16 addr_loadpalfromiff = 0xc1d8; static const uint16 addr_showpcx = 0xc1cc; @@ -1457,7 +1456,7 @@ public: void runtap(); //void domix(); void priesttext(); - void paneltomap(); + //void paneltomap(); //void obname(); void getridoftemp3(); void getridoftemp2(); diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index c5a1742a9b..58bda83d84 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -198,5 +198,5 @@ void addtopeoplelist(); void addtopeoplelist(ReelRoutine *routine); void getexpos(); - + void paneltomap(); diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index 3c92640768..00fb1715ef 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -411,5 +411,9 @@ void DreamGenContext::zoom() { data.byte(kDidzoom) = 1; } +void DreamGenContext::paneltomap() { + multiget(segRef(data.word(kMapstore)).ptr(0, 0), data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize)); +} + } /*namespace dreamgen */ |