DREAMWEB: 'showpanel' ported to C++

4 files changed, 10 insertions, 19 deletions

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 4dfdb7fbfd..8b8b6227be 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -17445,22 +17445,6 @@ void DreamGenContext::showman() {
 	showframe();
 }
 
-void DreamGenContext::showpanel() {
-	STACK_CHECK;
-	ds = data.word(kIcons1);
-	di = 72;
-	bx = 0;
-	al = 19;
-	ah = 0;
-	showframe();
-	ds = data.word(kIcons1);
-	di = 192;
-	bx = 0;
-	al = 19;
-	ah = 0;
-	showframe();
-}
-
 void DreamGenContext::roomname() {
 	STACK_CHECK;
 	di = 88;
@@ -19763,7 +19747,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_showicon: showicon(); break;
 		case addr_middlepanel: middlepanel(); break;
 		case addr_showman: showman(); break;
-		case addr_showpanel: showpanel(); break;
 		case addr_roomname: roomname(); break;
 		case addr_usecharset1: usecharset1(); break;
 		case addr_usetempcharset: usetempcharset(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 85802243d2..16b23db749 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -111,7 +111,6 @@ public:
 	static const uint16 addr_usetempcharset = 0xca7c;
 	static const uint16 addr_usecharset1 = 0xca78;
 	static const uint16 addr_roomname = 0xca74;
-	static const uint16 addr_showpanel = 0xca70;
 	static const uint16 addr_showman = 0xca6c;
 	static const uint16 addr_middlepanel = 0xca68;
 	static const uint16 addr_showicon = 0xca64;
@@ -1393,7 +1392,7 @@ public:
 	void getpersframe();
 	void doshake();
 	void resetkeyboard();
-	void showpanel();
+	//void showpanel();
 	void soundstartup();
 	void slabdoora();
 	void fadeupyellows();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a605bbda91..9130a6c846 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1064,5 +1064,12 @@ void DreamGenContext::commandwithob(uint8 command, uint8 type, uint8 index) {
 	data.byte(kNewtextline) = 1;
 }
 
+void DreamGenContext::showpanel() {
+	Frame *frame = (Frame *)segRef(data.word(kIcons1)).ptr(0, sizeof(Frame));
+	uint8 width, height;
+	showframe(frame, 72, 0, 19, 0, &width, &height);
+	showframe(frame, 192, 0, 19, 0, &width, &height);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a6cf2c0563..1f14faf404 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -126,4 +126,6 @@
 	void copyname(uint8 type, uint8 index, uint8 *dst);
 	void commandwithob();
 	void commandwithob(uint8 command, uint8 type, uint8 index);
+	void showpanel();
+