DREAMWEB: Port 'monitorlogo' to C++

5 files changed, 18 insertions, 23 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 2a317d4f96..8e95f1c608 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -475,6 +475,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'middlepanel',
 	'mode640x480',
 	'modifychar',
+	'monitorlogo',
 	'monkandryan',
 	'monks2text',
 	'monmessage',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 93d0e171d7..28dfa9d5b1 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3866,27 +3866,6 @@ finishpars:
 	di = offset_operand1;
 }
 
-void DreamGenContext::monitorLogo() {
-	STACK_CHECK;
-	al = data.byte(kLogonum);
-	_cmp(al, data.byte(kOldlogonum));
-	if (flags.z())
-		goto notnewlogo;
-	data.byte(kOldlogonum) = al;
-	printLogo();
-	printUnderMon();
-	workToScreen();
-	printLogo();
-	printLogo();
-	al = 26;
-	playChannel1();
-	cx = 20;
-	randomAccess();
-	return;
-notnewlogo:
-	printLogo();
-}
-
 void DreamGenContext::processTrigger() {
 	STACK_CHECK;
 	_cmp(data.byte(kLasttrigger), '1');
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d645ce70ac..e73f2244fd 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -574,7 +574,6 @@ public:
 	void removeObFromInv();
 	void heavy();
 	void useKey();
-	void monitorLogo();
 	void dirFile();
 	void pickupConts();
 	void allPalette();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 49cd800b48..f01664632a 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -54,7 +54,7 @@ void DreamGenContext::useMon() {
 	printOuterMon();
 	initialMonCols();
 	printLogo();
-	workToScreen();
+	workToScreenCPP();
 	turnOnPower();
 	fadeupYellows();
 	fadeupMonFirst();
@@ -97,6 +97,21 @@ void DreamGenContext::useMon() {
 	workToScreenM();
 }
 
+void DreamGenContext::monitorLogo() {
+	if (data.byte(kLogonum) != data.byte(kOldlogonum)) {
+		data.byte(kOldlogonum) = data.byte(kLogonum);
+		printLogo();
+		printUnderMon();
+		workToScreenCPP();
+		printLogo();
+		printLogo();
+		playChannel1(26);
+		randomAccess(20);
+	} else {
+		printLogo();
+	}
+}
+
 void DreamBase::printLogo() {
 	showFrame(tempGraphics(), 56, 32, 0, 0);
 	showCurrentFile();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3d29351df7..943032523b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -562,5 +562,6 @@
 	void hangOnPQ();
 	void showGun();
 	void endGame();
+	void monitorLogo();
 
 #endif