DREAMWEB: 'drawfloor' ported to C++

5 files changed, 20 insertions, 21 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 79749bd40e..2730e45e6b 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -317,6 +317,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'steady',
 	'constant',
 	'random',
+	'drawfloor',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 98c9855ad3..5e0520e1ff 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4827,24 +4827,6 @@ beforethistext:
 		goto shuffletextads;
 }
 
-void DreamGenContext::drawfloor() {
-	STACK_CHECK;
-	push(es);
-	push(bx);
-	eraseoldobs();
-	drawflags();
-	calcmapad();
-	doblocks();
-	showallobs();
-	showallfree();
-	showallex();
-	paneltomap();
-	initrain();
-	data.byte(kNewobs) = 0;
-	bx = pop();
-	es = pop();
-}
-
 void DreamGenContext::redrawmainscrn() {
 	STACK_CHECK;
 	data.word(kTimecount) = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e8642e83ca..ccffb210ac 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -340,7 +340,6 @@ public:
 	static const uint16 addr_talk = 0xc480;
 	static const uint16 addr_getback1 = 0xc47c;
 	static const uint16 addr_redrawmainscrn = 0xc478;
-	static const uint16 addr_drawfloor = 0xc428;
 	static const uint16 addr_deleteextext = 0xc420;
 	static const uint16 addr_deleteexframe = 0xc41c;
 	static const uint16 addr_deleteexobject = 0xc418;
@@ -1155,7 +1154,7 @@ public:
 	void gettime();
 	void candles1();
 	void fadedos();
-	void drawfloor();
+	void runendseq();
 	void loadkeypad();
 	void findtext1();
 	void isryanholding();
@@ -1229,7 +1228,6 @@ public:
 	void talk();
 	void getridoftemp2();
 	void usebalcony();
-	void runendseq();
 	void decide();
 	void disablesoundint();
 	void priesttext();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a566f8f222..c4e2ae18a6 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2509,5 +2509,22 @@ void DreamGenContext::loadtemptext(const char *fileName) {
 	data.word(kTextfile1) = standardload(fileName);
 }
 
+void DreamGenContext::drawfloor() {
+	eraseoldobs();
+	drawflags();
+	calcmapad();
+	push(es);
+	push(bx);
+	doblocks();
+	bx = pop();
+	es = pop();
+	showallobs();
+	showallfree();
+	showallex();
+	paneltomap();
+	initrain();
+	data.byte(kNewobs) = 0;
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5236ed4ddf..6ac7d41504 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -372,4 +372,5 @@
 	void loadtemptext();
 	void loadtemptext(const char *fileName);
 	void loadtraveltext();
+	void drawfloor();