DREAMWEB: 'switchryanon' and 'switchryanoff' ported to C++

5 files changed, 14 insertions, 16 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a651ed1bef..b90f0b65f5 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -33,6 +33,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'randomnumber',
 	'startup',
 	'startup1',
+	'switchryanon',
+	'switchryanoff',
 	'quickquit',
 	'quickquit2',
 	'seecommandtail',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 617590b006..4ce51014f4 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9024,16 +9024,6 @@ void DreamGenContext::removefreeobject() {
 	es = pop();
 }
 
-void DreamGenContext::switchryanon() {
-	STACK_CHECK;
-	data.byte(kRyanon) = 255;
-}
-
-void DreamGenContext::switchryanoff() {
-	STACK_CHECK;
-	data.byte(kRyanon) = 1;
-}
-
 void DreamGenContext::autoappear() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 32);
@@ -15155,8 +15145,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_issetobonmap: issetobonmap(); break;
 		case addr_placefreeobject: placefreeobject(); break;
 		case addr_removefreeobject: removefreeobject(); break;
-		case addr_switchryanon: switchryanon(); break;
-		case addr_switchryanoff: switchryanoff(); break;
 		case addr_autoappear: autoappear(); break;
 		case addr_setuptimeduse: setuptimeduse(); break;
 		case addr_edenscdplayer: edenscdplayer(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 90f84e1927..fc9ae785c8 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -247,8 +247,6 @@ public:
 	static const uint16 addr_edenscdplayer = 0xc728;
 	static const uint16 addr_setuptimeduse = 0xc71c;
 	static const uint16 addr_autoappear = 0xc70c;
-	static const uint16 addr_switchryanoff = 0xc700;
-	static const uint16 addr_switchryanon = 0xc6fc;
 	static const uint16 addr_removefreeobject = 0xc6f4;
 	static const uint16 addr_placefreeobject = 0xc6f0;
 	static const uint16 addr_issetobonmap = 0xc6ec;
@@ -1720,7 +1718,7 @@ public:
 	void showloadops();
 	void examicon();
 	void showgun();
-	void switchryanon();
+	//void switchryanon();
 	//void personnametext();
 	void louischair();
 	void saveems();
@@ -1919,7 +1917,7 @@ public:
 	//void multiput();
 	//void printmessage();
 	void businessman();
-	void switchryanoff();
+	//void switchryanoff();
 	//void commandwithob();
 	void panelicons1();
 	void adjustdown();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 75c1fb55b7..5dc1ee06ba 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -237,6 +237,14 @@ void DreamGenContext::startup1() {
 	fadescreenup();
 }
 
+void DreamGenContext::switchryanon() {
+	data.byte(kRyanon) = 255;
+}
+
+void DreamGenContext::switchryanoff() {
+	data.byte(kRyanon) = 1;
+}
+
 static Common::String getFilename(Context &context) {
 	const char *name = (const char *)context.cs.ptr(context.dx, 0);
 	return Common::String(name);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 68f0776f7f..c613591089 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -21,6 +21,8 @@
  */
 	void startup();
 	void startup1();
+	void switchryanon();
+	void switchryanoff();
 	uint16 allocatemem(uint16 paragraphs);
 	void deallocatemem(uint16 segment);
 	uint8 *workspace();