DREAMWEB: 'showdiscops' ported to C++

5 files changed, 14 insertions, 34 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 320937ef8d..958c9ddfdf 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -264,6 +264,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'randomaccess',
 	'turnonpower',
 	'showmainops',
+	'showdiscops',
 	'powerlighton',
 	'powerlightoff',
 	'accesslighton',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 89e8ca3891..fa25cda34e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -10844,34 +10844,6 @@ opsblock1:
 	blank();
 }
 
-void DreamGenContext::showdiscops() {
-	STACK_CHECK;
-	ds = data.word(kTempgraphics);
-	di = (60)+128+4;
-	bx = (52)+12;
-	al = 1;
-	ah = 0;
-	showframe();
-	ds = data.word(kTempgraphics);
-	di = (60)+10;
-	bx = (52)+10;
-	al = 9;
-	ah = 0;
-	showframe();
-	ds = data.word(kTempgraphics);
-	di = (60)+59;
-	bx = (52)+30;
-	al = 10;
-	ah = 0;
-	showframe();
-	ds = data.word(kTempgraphics);
-	di = (60)+176+2;
-	bx = (52)+60-4;
-	al = 5;
-	ah = 0;
-	showframe();
-}
-
 void DreamGenContext::loadsavebox() {
 	STACK_CHECK;
 	dx = 1961;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 89a07bc9d3..abf6fe14d5 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -165,7 +165,6 @@ public:
 	static const uint16 addr_getbacktoops = 0xc848;
 	static const uint16 addr_loadgame = 0xc844;
 	static const uint16 addr_loadsavebox = 0xc840;
-	static const uint16 addr_showdiscops = 0xc83c;
 	static const uint16 addr_getbackfromops = 0xc834;
 	static const uint16 addr_dosaveload = 0xc830;
 	static const uint16 addr_zoomonoff = 0xc828;
@@ -1236,7 +1235,7 @@ public:
 	void intromonks1();
 	void resetlocation();
 	//void oldtonames();
-	void showdiscops();
+	void intromonks2();
 	void advisor();
 	void additionaltext();
 	//void compare();
@@ -1389,6 +1388,7 @@ public:
 	//void spriteupdate();
 	//void usetempcharset();
 	void discops();
+	//void showdiscops();
 	//void printdirect();
 	//void delthisone();
 	//void makebackob();
@@ -1482,11 +1482,11 @@ public:
 	void redes();
 	//void turnanypathoff();
 	void errormessage1();
-	void clearchanges();
+	void errormessage2();
 	void errormessage3();
 	//void deletetaken();
 	//void putundermenu();
-	void intromonks2();
+	//void checkifex();
 	void intromagic2();
 	void intromagic3();
 	void edeninbath();
@@ -1782,7 +1782,7 @@ public:
 	void greyscalesum();
 	void buttoneight();
 	void findexobject();
-	void errormessage2();
+	void clearchanges();
 	void usechurchhole();
 	void searchforfiles();
 	void monkspeaking();
@@ -1803,7 +1803,6 @@ public:
 	//void delcurs();
 	//void randomaccess();
 	//void calcfrframe();
-	//void checkifex();
 	//void findobname();
 	void initialmoncols();
 	void checkforshake();
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 1c8475268c..c96dd51390 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -373,5 +373,12 @@ void DreamGenContext::showmainops() {
 	showframe(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
 }
 
+void DreamGenContext::showdiscops() {
+	showframe(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
+	showframe(tempGraphics(), kOpsx+10, kOpsy+10, 9, 0);
+	showframe(tempGraphics(), kOpsx+59, kOpsy+30, 10, 0);
+	showframe(tempGraphics(), kOpsx+176+2, kOpsy+60-4, 5, 0);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ae26e1fe01..465a02611a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -329,6 +329,7 @@
 	void playchannel1();
 	void playchannel1(uint8 index);
 	void showmainops();
+	void showdiscops();
 	void createpanel();
 	void createpanel2();
 	void findroominloc();