DREAMWEB: Ported 'showryanpage' to C++

5 files changed, 9 insertions, 27 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 94276642b4..2193954cca 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -188,6 +188,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'isitworn',
 	'makeworn',
 	'obtoinv',
+	'showryanpage',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 3ee8c791ce..a03aa62b83 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4101,30 +4101,6 @@ void DreamGenContext::openinv() {
 	data.byte(kCommandtype) = 255;
 }
 
-void DreamGenContext::showryanpage() {
-	STACK_CHECK;
-	ds = data.word(kIcons1);
-	di = (80)+167;
-	bx = (58)-12;
-	al = 12;
-	ah = 0;
-	showframe();
-	al = 13;
-	_add(al, data.byte(kRyanpage));
-	push(ax);
-	al = data.byte(kRyanpage);
-	ah = 0;
-	cx = 18;
-	_mul(cx);
-	ds = data.word(kIcons1);
-	di = (80)+167;
-	_add(di, ax);
-	bx = (58)-12;
-	ax = pop();
-	ah = 0;
-	showframe();
-}
-
 void DreamGenContext::openob() {
 	STACK_CHECK;
 	al = data.byte(kOpenedob);
@@ -17313,7 +17289,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_getbackfromob: getbackfromob(); break;
 		case addr_incryanpage: incryanpage(); break;
 		case addr_openinv: openinv(); break;
-		case addr_showryanpage: showryanpage(); break;
 		case addr_openob: openob(); break;
 		case addr_examicon: examicon(); break;
 		case addr_describeob: describeob(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 68e7b65ac2..6c62e9b0ae 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -488,7 +488,6 @@ public:
 	static const uint16 addr_describeob = 0xc364;
 	static const uint16 addr_examicon = 0xc35c;
 	static const uint16 addr_openob = 0xc354;
-	static const uint16 addr_showryanpage = 0xc350;
 	static const uint16 addr_openinv = 0xc34c;
 	static const uint16 addr_incryanpage = 0xc348;
 	static const uint16 addr_getbackfromob = 0xc344;
@@ -1949,7 +1948,7 @@ public:
 	//void drawflags();
 	void zoomonoff();
 	void updatesymboltop();
-	void showryanpage();
+	//void showryanpage();
 	void printlogo();
 	void allpointer();
 	void showseconduse();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 394de96e05..8985392cfc 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1816,5 +1816,11 @@ void DreamGenContext::obtoinv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 		showframe(icons1, x - 3, y - 2, 7, 0);
 }
 
+void DreamGenContext::showryanpage() {
+	Frame *icons1 = (Frame *)segRef(data.word(kIcons1)).ptr(0, 0);
+	showframe(icons1, kInventx + 167, kInventy - 12, 12, 0);
+	showframe(icons1, kInventx + 167 + 18 * data.byte(kRyanpage), kInventy - 12, 13 + data.byte(kRyanpage), 0);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 70ba5f70d5..10cb2e8866 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -226,4 +226,5 @@
 	void makeworn(DynObject *object);
 	void obtoinv();
 	void obtoinv(uint8 index, uint8 flag, uint16 x, uint16 y);
+	void showryanpage();