DREAMWEB: 'showwatch' ported to C++

4 files changed, 10 insertions, 19 deletions

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 24968bd628..86ef9c4c23 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -14639,20 +14639,6 @@ zoomisoff:
 	showwatch();
 }
 
-void DreamGenContext::showwatch() {
-	STACK_CHECK;
-	_cmp(data.byte(kWatchon), 0);
-	if (flags.z())
-		return /* (nowristwatch) */;
-	ds = data.word(kIcons1);
-	di = 250;
-	bx = 1;
-	al = 6;
-	ah = 0;
-	showframe();
-	showtime();
-}
-
 void DreamGenContext::zoomicon() {
 	STACK_CHECK;
 	_cmp(data.byte(kZoomon), 0);
@@ -16875,7 +16861,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_usetempcharset: usetempcharset(); break;
 		case addr_showexit: showexit(); break;
 		case addr_panelicons1: panelicons1(); break;
-		case addr_showwatch: showwatch(); break;
 		case addr_gettime: gettime(); break;
 		case addr_zoomicon: zoomicon(); break;
 		case addr_worktoscreenm: worktoscreenm(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e74f68c72e..1368a53f85 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -89,7 +89,6 @@ public:
 	static const uint16 addr_worktoscreenm = 0xca9c;
 	static const uint16 addr_zoomicon = 0xca90;
 	static const uint16 addr_gettime = 0xca8c;
-	static const uint16 addr_showwatch = 0xca88;
 	static const uint16 addr_panelicons1 = 0xca84;
 	static const uint16 addr_showexit = 0xca80;
 	static const uint16 addr_usetempcharset = 0xca7c;
@@ -1262,7 +1261,7 @@ public:
 	//void frameoutbh();
 	void getobtextstart();
 	void loadfolder();
-	void decide();
+	void dumpdiarykeys();
 	//void dumppointer();
 	void reelsonscreen();
 	void getridofreels();
@@ -1420,7 +1419,7 @@ public:
 	void getridoftemp2();
 	void usebalcony();
 	void runendseq();
-	void dumpdiarykeys();
+	void decide();
 	void disablesoundint();
 	void priesttext();
 	//void showallex();
@@ -1797,7 +1796,7 @@ public:
 	void checkinside();
 	void gates();
 	void newgame();
-	void showwatch();
+	//void showwatch();
 	//void turnanypathon();
 	void restorereels();
 	void setwalk();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4f956d309a..85f620b74a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1952,6 +1952,12 @@ void DreamGenContext::mainscreen() {
 		walkandexamine();
 }
 
+void DreamGenContext::showwatch() {
+	if (data.byte(kWatchon)) {
+		showframe((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), 250, 1, 6, 0);
+		showtime();
+	}
+}
 
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 1ced8ea61a..510cc3d43f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -250,4 +250,5 @@
 	uint16 getpersframe(uint8 index);
 	void convicons();
 	void examineob(bool examineAgain = true);
+	void showwatch();