DREAMWEB: 'usetempcharset' and 'usecharset1' ported to C++

5 files changed, 15 insertions, 16 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index b94c358126..e86209908e 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -281,6 +281,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'onedigit',
 	'showword',
 	'convnum',
+	'usecharset1',
+	'usetempcharset',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a3cafdba40..63c014d545 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -12775,18 +12775,6 @@ void DreamGenContext::showman() {
 	showframe();
 }
 
-void DreamGenContext::usecharset1() {
-	STACK_CHECK;
-	ax = data.word(kCharset1);
-	data.word(kCurrentset) = ax;
-}
-
-void DreamGenContext::usetempcharset() {
-	STACK_CHECK;
-	ax = data.word(kTempcharset);
-	data.word(kCurrentset) = ax;
-}
-
 void DreamGenContext::showexit() {
 	STACK_CHECK;
 	ds = data.word(kIcons1);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7c169e58ee..fc0b7fae5e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -79,8 +79,6 @@ public:
 	static const uint16 addr_gettime = 0xca8c;
 	static const uint16 addr_panelicons1 = 0xca84;
 	static const uint16 addr_showexit = 0xca80;
-	static const uint16 addr_usetempcharset = 0xca7c;
-	static const uint16 addr_usecharset1 = 0xca78;
 	static const uint16 addr_showman = 0xca6c;
 	static const uint16 addr_middlepanel = 0xca68;
 	static const uint16 addr_workoutframes = 0xca54;
@@ -1396,7 +1394,7 @@ public:
 	void locklighton();
 	void useladderb();
 	//void spriteupdate();
-	void usetempcharset();
+	//void usetempcharset();
 	void discops();
 	//void printdirect();
 	//void delthisone();
@@ -1779,7 +1777,7 @@ public:
 	void tattooman();
 	void usehandle();
 	void openfile();
-	void usecharset1();
+	//void usecharset1();
 	//void makenextblock();
 	void showpuztext();
 	//void addalong();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 028b5fcf94..cdc692f3e3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2308,5 +2308,13 @@ void DreamGenContext::dolook() {
 	worktoscreenm();
 }
 
+void DreamGenContext::usecharset1() {
+	data.word(kCurrentset) = data.word(kCharset1);
+}
+
+void DreamGenContext::usetempcharset() {
+	data.word(kCurrentset) = data.word(kTempcharset);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a53f1bbe7a..92917f7ff8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -335,4 +335,7 @@
 	void look();
 	void autolook();
 	void dolook();
+	void usetempcharset();
+	void usecharset1();
+