DREAMWEB: 'showmainops' ported to C++

5 files changed, 11 insertions, 27 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a0a2ba9ed8..3af0b59aa5 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -261,6 +261,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'neterror',
 	'randomaccess',
 	'turnonpower',
+	'showmainops',
 	'powerlighton',
 	'powerlightoff',
 	'accesslighton',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 507a8f80a9..a3096fb0df 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -11045,28 +11045,6 @@ opsblock1:
 	blank();
 }
 
-void DreamGenContext::showmainops() {
-	STACK_CHECK;
-	ds = data.word(kTempgraphics);
-	di = (60)+10;
-	bx = (52)+10;
-	al = 8;
-	ah = 0;
-	showframe();
-	ds = data.word(kTempgraphics);
-	di = (60)+59;
-	bx = (52)+30;
-	al = 7;
-	ah = 0;
-	showframe();
-	ds = data.word(kTempgraphics);
-	di = (60)+128+4;
-	bx = (52)+12;
-	al = 1;
-	ah = 0;
-	showframe();
-}
-
 void DreamGenContext::showdiscops() {
 	STACK_CHECK;
 	ds = data.word(kTempgraphics);
@@ -15133,7 +15111,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_zoomonoff: zoomonoff(); break;
 		case addr_dosaveload: dosaveload(); break;
 		case addr_getbackfromops: getbackfromops(); break;
-		case addr_showmainops: showmainops(); break;
 		case addr_showdiscops: showdiscops(); break;
 		case addr_loadsavebox: loadsavebox(); break;
 		case addr_loadgame: loadgame(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 4311babb3b..fd8636364c 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -178,7 +178,6 @@ public:
 	static const uint16 addr_loadgame = 0xc844;
 	static const uint16 addr_loadsavebox = 0xc840;
 	static const uint16 addr_showdiscops = 0xc83c;
-	static const uint16 addr_showmainops = 0xc838;
 	static const uint16 addr_getbackfromops = 0xc834;
 	static const uint16 addr_dosaveload = 0xc830;
 	static const uint16 addr_zoomonoff = 0xc828;
@@ -1184,6 +1183,7 @@ public:
 	void uselighter();
 	void showmenu();
 	void usepoolreader();
+	//void showmainops();
 	void startdmablock();
 	void useopenbox();
 	void clearbuffers();
@@ -1481,7 +1481,6 @@ public:
 	void selectob();
 	//void checkcoords();
 	//void usetext();
-	void chewy();
 	//void accesslighton();
 	void useplinth();
 	//void adjustlen();
@@ -1553,7 +1552,7 @@ public:
 	void madman();
 	void createpanel();
 	//void turnpathon();
-	void enablesoundint();
+	void chewy();
 	void madmanstelly();
 	void constant();
 	void purgealocation();
@@ -1601,7 +1600,7 @@ public:
 	void playguitar();
 	//void showreelframe();
 	void searchforsame();
-	void showmainops();
+	void enablesoundint();
 	void getback1();
 	void setlocation();
 	void fadefromwhite();
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 0fcd1b5181..1c8475268c 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -367,5 +367,11 @@ void DreamGenContext::saveload() {
 		dosaveload();
 }
 
+void DreamGenContext::showmainops() {
+	showframe(tempGraphics(), kOpsx+10, kOpsy+10, 8, 0);
+	showframe(tempGraphics(), kOpsx+59, kOpsy+30, 7, 0);
+	showframe(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index fe761530f0..2b762c0793 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -324,4 +324,5 @@
 	void powerlightoff();
 	void playchannel0(uint8 index);
 	void playchannel1(uint8 index);
+	void showmainops();