DREAMWEB: 'powerlighton' and 'powerlightoff' ported to C++

5 files changed, 17 insertions, 41 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 31ce367405..8223bc3352 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -253,6 +253,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'monmessage',
 	'neterror',
 	'randomaccess',
+	'powerlighton',
+	'powerlightoff',
 	'accesslighton',
 	'accesslightoff',
 	], skip_output = [
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index dda636798e..6d9ab4189f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6096,40 +6096,6 @@ powerloop:
 	powerlighton();
 }
 
-void DreamGenContext::powerlighton() {
-	STACK_CHECK;
-	di = 257+4;
-	bx = 182;
-	ds = data.word(kTempgraphics);
-	al = 6;
-	ah = 0;
-	push(di);
-	push(bx);
-	showframe();
-	bx = pop();
-	di = pop();
-	cl = 12;
-	ch = 8;
-	multidump();
-}
-
-void DreamGenContext::powerlightoff() {
-	STACK_CHECK;
-	di = 257+4;
-	bx = 182;
-	ds = data.word(kTempgraphics);
-	al = 5;
-	ah = 0;
-	push(di);
-	push(bx);
-	showframe();
-	bx = pop();
-	di = pop();
-	cl = 12;
-	ch = 8;
-	multidump();
-}
-
 void DreamGenContext::locklighton() {
 	STACK_CHECK;
 	di = 56;
@@ -15150,8 +15116,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_loadcart: loadcart(); break;
 		case addr_lookininterface: lookininterface(); break;
 		case addr_turnonpower: turnonpower(); break;
-		case addr_powerlighton: powerlighton(); break;
-		case addr_powerlightoff: powerlightoff(); break;
 		case addr_locklighton: locklighton(); break;
 		case addr_locklightoff: locklightoff(); break;
 		case addr_makecaps: makecaps(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e4e42e2ee0..78df0d59a0 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -358,8 +358,6 @@ public:
 	static const uint16 addr_makecaps = 0xc524;
 	static const uint16 addr_locklightoff = 0xc51c;
 	static const uint16 addr_locklighton = 0xc518;
-	static const uint16 addr_powerlightoff = 0xc50c;
-	static const uint16 addr_powerlighton = 0xc508;
 	static const uint16 addr_turnonpower = 0xc500;
 	static const uint16 addr_lookininterface = 0xc4fc;
 	static const uint16 addr_loadcart = 0xc4f8;
@@ -1317,7 +1315,6 @@ public:
 	void showdiary();
 	//void loadroomssample();
 	//void updatepeople();
-	//void addtopeoplelist();
 	//void hangoncurs();
 	//void getblockofpixel();
 	//void kernchars();
@@ -1327,6 +1324,7 @@ public:
 	//void dealwithspecial();
 	//void eraseoldobs();
 	void dircom();
+	//void powerlighton();
 	//void liftsprite();
 	void dumpkeypad();
 	void showsymbol();
@@ -1587,7 +1585,7 @@ public:
 	void setkeyboardint();
 	void priest();
 	//void readmouse();
-	void powerlighton();
+	//void addtopeoplelist();
 	void savefilewrite();
 	void printmessage2();
 	//void showallfree();
@@ -1716,7 +1714,7 @@ public:
 	//void showrain();
 	void useopened();
 	void inventory();
-	void powerlightoff();
+	//void powerlightoff();
 	void fillopen();
 	//void showoutermenu();
 	void signon();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 5372981044..a569c116bf 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -247,5 +247,15 @@ void DreamGenContext::neterror() {
 	scrollmonitor();
 }
 
+void DreamGenContext::powerlighton() {
+	showframe(tempGraphics(), 257+4, 182, 6, 0);
+	multidump(257+4, 182, 12, 8);
+}
+
+void DreamGenContext::powerlightoff() {
+	showframe(tempGraphics(), 257+4, 182, 5, 0);
+	multidump(257+4, 182, 12, 8);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 1cfeab3a70..fafc14eb8e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -315,4 +315,6 @@
 	void monmessage(uint8 index);
 	void monmessage();
 	void neterror();
+	void powerlighton();
+	void powerlightoff();