[Scummvm-cvs-logs] scummvm master -> 233592d28a1f0ebf01c6ba29f3c2f6673f97553a

[tramboi]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
233592d28a DREAMWEB: 'maptopanel' and 'dumpmap' ported to C++


Commit: 233592d28a1f0ebf01c6ba29f3c2f6673f97553a
    https://github.com/scummvm/scummvm/commit/233592d28a1f0ebf01c6ba29f3c2f6673f97553a
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-08-30T03:27:10-07:00

Commit Message:
DREAMWEB: 'maptopanel' and 'dumpmap' ported to C++

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/stubs.h
    engines/dreamweb/vgagrafx.cpp



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index f0cfe30..658ff74 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -168,6 +168,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'addtopeoplelist',
 	'getexpos',
 	'paneltomap',
+	'maptopanel',
+	'dumpmap',
 	'obpicture',
 	'delthisone',
 	'transferinv',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ee03444..b239842 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2657,30 +2657,6 @@ nought:
 		goto palloop;
 }
 
-void DreamGenContext::maptopanel() {
-	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);
-	multiput();
-}
-
-void DreamGenContext::dumpmap() {
-	STACK_CHECK;
-	di = data.word(kMapxstart);
-	_add(di, data.word(kMapadx));
-	bx = data.word(kMapystart);
-	_add(bx, data.word(kMapady));
-	cl = data.byte(kMapxsize);
-	ch = data.byte(kMapysize);
-	multidump();
-}
-
 void DreamGenContext::pixelcheckset() {
 	STACK_CHECK;
 	push(ax);
@@ -17676,8 +17652,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_showpcx: showpcx(); break;
 		case addr_loadpalfromiff: loadpalfromiff(); break;
 		case addr_setmode: setmode(); break;
-		case addr_maptopanel: maptopanel(); break;
-		case addr_dumpmap: dumpmap(); break;
 		case addr_pixelcheckset: pixelcheckset(); break;
 		case addr_createpanel: createpanel(); break;
 		case addr_createpanel2: createpanel2(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 196c630..2eb0b93 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -562,8 +562,6 @@ public:
 	static const uint16 addr_createpanel2 = 0xc200;
 	static const uint16 addr_createpanel = 0xc1fc;
 	static const uint16 addr_pixelcheckset = 0xc1f8;
-	static const uint16 addr_dumpmap = 0xc1f4;
-	static const uint16 addr_maptopanel = 0xc1f0;
 	static const uint16 addr_setmode = 0xc1dc;
 	static const uint16 addr_loadpalfromiff = 0xc1d8;
 	static const uint16 addr_showpcx = 0xc1cc;
@@ -1290,7 +1288,7 @@ public:
 	//void lockeddoorway();
 	void isitworn();
 	//void putundertimed();
-	void dumpmap();
+	//void dumpmap();
 	//void multidump();
 	void channel0only();
 	void worktoscreenm();
@@ -1539,7 +1537,7 @@ public:
 	void monks2text();
 	void clearpalette();
 	void cantdrop();
-	void maptopanel();
+	//void maptopanel();
 	//void calcmapad();
 	void getridofall();
 	void copper();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f025e38..f137707 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -201,6 +201,8 @@
 	void addtopeoplelist(ReelRoutine *routine);
 	void getexpos();
 	void paneltomap();
+	void maptopanel();
+	void dumpmap();
 	void obpicture();
 	void transferinv();
 
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 235d28c..5c63b88 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -415,6 +415,14 @@ 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));
 }
 
+void DreamGenContext::maptopanel() {
+	multiput(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));
+}
+
+void DreamGenContext::dumpmap() {
+	multidump(data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
+}
+
 void DreamGenContext::transferinv() {
 	const Frame *freeFrames = (const Frame *)segRef(data.word(kFreeframes)).ptr(kFrframedata, 0);
 	const Frame *freeFrame = freeFrames + (3 * data.byte(kItemtotran) + 1);