From 4d92522fcc51aff067c6ab0a525b3c825f51e2ae Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Thu, 1 Dec 2011 00:01:54 +0100
Subject: DREAMWEB: 'worktoscreenm' ported to C++

---
 devtools/tasmrecover/tasm-recover |  1 +
 engines/dreamweb/dreamgen.cpp     | 10 ----------
 engines/dreamweb/dreamgen.h       |  2 --
 engines/dreamweb/stubs.cpp        |  9 +++++++++
 engines/dreamweb/stubs.h          |  1 +
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a2e6435bd0..27fb419051 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -333,6 +333,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'removeemm',
 	'setupemm',
 	'trysoundalloc',
+	'worktoscreenm',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d5d2ca8e4e..c58bf5f909 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -12009,16 +12009,6 @@ zoomisoff:
 	showwatch();
 }
 
-void DreamGenContext::worktoscreenm() {
-	STACK_CHECK;
-	animpointer();
-	readmouse();
-	showpointer();
-	vsync();
-	worktoscreen();
-	delpointer();
-}
-
 void DreamGenContext::blank() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 199);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 834abf04f0..a3b51036d9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -67,7 +67,6 @@ public:
 	static const uint16 addr_getunderzoom = 0xcab4;
 	static const uint16 addr_allpointer = 0xcaa4;
 	static const uint16 addr_blank = 0xcaa0;
-	static const uint16 addr_worktoscreenm = 0xca9c;
 	static const uint16 addr_gettime = 0xca8c;
 	static const uint16 addr_panelicons1 = 0xca84;
 	static const uint16 addr_showexit = 0xca80;
@@ -1114,7 +1113,6 @@ public:
 	void useopenbox();
 	void clearbuffers();
 	void showsymbol();
-	void worktoscreenm();
 	void getobtextstart();
 	void dumpdiarykeys();
 	void getridofreels();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 09f6f7109e..2d8faa7a58 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2483,5 +2483,14 @@ void DreamGenContext::allocatebuffers() {
 	data.word(kSounddata2) = allocatemem(2048/16);
 }
 
+void DreamGenContext::worktoscreenm() {
+	animpointer();
+	readmouse();
+	showpointer();
+	vsync();
+	worktoscreen();
+	delpointer();
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 67cfe41212..1ec3e1411d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -374,4 +374,5 @@
 	void loadtraveltext();
 	void drawfloor();
 	void allocatebuffers();
+	void worktoscreenm();
 
-- 
cgit v1.2.3