From eb296fc9e0e00d816cce5912bffdb6e2689b93d0 Mon Sep 17 00:00:00 2001
From: Bertrand Augereau <bertrand_augereau@yahoo.fr>
Date: Tue, 29 Nov 2011 15:18:17 +0100
Subject: [PATCH] DREAMWEB: 'foldertext' ported to C++

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

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 713dc133c68..dab9dfbe31f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -308,6 +308,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'nextfolder',
 	'lastfolder',
 	'folderhints',
+	'folderexit',
 	'getlocation',
 	'setlocation',
 	], skip_output = [
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 753e15148bd..40cd84e80fc 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9754,16 +9754,6 @@ void DreamGenContext::loadfolder() {
 	loadtemptext();
 }
 
-void DreamGenContext::folderexit() {
-	STACK_CHECK;
-	ds = data.word(kTempgraphics2);
-	di = 296;
-	bx = 178;
-	al = 6;
-	ah = 0;
-	showframe();
-}
-
 void DreamGenContext::entersymbol() {
 	STACK_CHECK;
 	data.byte(kManisoffscreen) = 1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 13841c8cc02..3faae24f4df 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -176,7 +176,6 @@ public:
 	static const uint16 addr_settopleft = 0xc7e0;
 	static const uint16 addr_quitsymbol = 0xc7dc;
 	static const uint16 addr_entersymbol = 0xc7d8;
-	static const uint16 addr_folderexit = 0xc7cc;
 	static const uint16 addr_loadfolder = 0xc7c4;
 	static const uint16 addr_loadmenu = 0xc7b0;
 	static const uint16 addr_showmenu = 0xc7ac;
@@ -1156,7 +1155,7 @@ public:
 	void loadfolder();
 	void dumpdiarykeys();
 	//void dumppointer();
-	void bossman();
+	//void look();
 	void getridofreels();
 	void readkey();
 	void louis();
@@ -1440,7 +1439,6 @@ public:
 	//void quickquit();
 	//void showpointer();
 	void usecooker();
-	//void look();
 	void loadmenu();
 	void checkforemm();
 	//void checkifpathison();
@@ -1480,6 +1478,7 @@ public:
 	//void pixelcheckset();
 	void reexfrominv();
 	void examinventory();
+	//void folderexit();
 	void getridoftemp3();
 	void usedryer();
 	//void dumpeverything();
@@ -1547,7 +1546,7 @@ public:
 	void describeob();
 	void deleteexframe();
 	//void readsetdata();
-	void folderexit();
+	void bossman();
 	void dosreturn();
 	void wheelsound();
 	//void actualsave();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e6a32132d7e..17f762dad5f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2485,5 +2485,9 @@ void DreamGenContext::folderhints() {
 	}
 }
 
+void DreamGenContext::folderexit() {
+	showframe(tempGraphics2(), 296, 178, 6, 0);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f175d52a471..bffa07a343f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -362,6 +362,7 @@
 	void nextfolder();
 	void lastfolder();
 	void folderhints();
+	void folderexit();
 	uint8 getlocation(uint8 index);
 	void getlocation();
 	void setlocation(uint8 index);