DREAMWEB: 'openeden', 'openlouis', 'openpoolboss', 'openryan', 'opensarters', 'openyourneighbour' ported to C++

6 files changed, 42 insertions, 71 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 5e39e64a91..de7983edf5 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -405,8 +405,14 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'obtoinv',
 	'oldtonames',
 	'onedigit',
+	'openeden',
 	'openfile',
 	'openforsave',
+	'openlouis',
+	'openpoolboss',
+	'openryan'
+	'opensarters',
+	'openyourneighbour',
 	'othersmoker',
 	'out22c',
 	'paltoendpal',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c64e2f9ef3..0129dbdedd 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6240,16 +6240,6 @@ keyontv:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openLouis() {
-	STACK_CHECK;
-	al = 5;
-	ah = 2;
-	cl = 3;
-	ch = 8;
-	enterCode();
-	data.byte(kGetback) = 1;
-}
-
 void DreamGenContext::nextColon() {
 	STACK_CHECK;
 lookcolon:
@@ -6260,56 +6250,6 @@ lookcolon:
 		goto lookcolon;
 }
 
-void DreamGenContext::openYourNeighbour() {
-	STACK_CHECK;
-	al = 255;
-	ah = 255;
-	cl = 255;
-	ch = 255;
-	enterCode();
-	data.byte(kGetback) = 1;
-}
-
-void DreamGenContext::openRyan() {
-	STACK_CHECK;
-	al = 5;
-	ah = 1;
-	cl = 0;
-	ch = 6;
-	enterCode();
-	data.byte(kGetback) = 1;
-}
-
-void DreamGenContext::openPoolBoss() {
-	STACK_CHECK;
-	al = 5;
-	ah = 2;
-	cl = 2;
-	ch = 2;
-	enterCode();
-	data.byte(kGetback) = 1;
-}
-
-void DreamGenContext::openEden() {
-	STACK_CHECK;
-	al = 2;
-	ah = 8;
-	cl = 6;
-	ch = 5;
-	enterCode();
-	data.byte(kGetback) = 1;
-}
-
-void DreamGenContext::openSarters() {
-	STACK_CHECK;
-	al = 7;
-	ah = 8;
-	cl = 3;
-	ch = 3;
-	enterCode();
-	data.byte(kGetback) = 1;
-}
-
 void DreamGenContext::drawItAll() {
 	STACK_CHECK;
 	createPanel();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index ba8d645ed7..678a14858e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -552,7 +552,6 @@ public:
 	void decide();
 	void entryTexts();
 	void checkInput();
-	void openSarters();
 	void putUnderCentre();
 	void checkObjectSize();
 	void deallocateMem();
@@ -612,7 +611,6 @@ public:
 	void dumpDiaryKeys();
 	void disableSoundInt();
 	void priestText();
-	void openPoolBoss();
 	void usePlate();
 	void lookInInterface();
 	void loadSpeech();
@@ -624,7 +622,6 @@ public:
 	void printOuterMon();
 	void showDecisions();
 	void removeObFromInv();
-	void openYourNeighbour();
 	void heavy();
 	void useKey();
 	void lockLightOn();
@@ -727,7 +724,6 @@ public:
 	void destSelect();
 	void lastDest();
 	void removeFreeObject();
-	void openLouis();
 	void lookAtCard();
 	void helicopter();
 	void getEitherAd();
@@ -776,7 +772,6 @@ public:
 	void selectOpenOb();
 	void useGun();
 	void autoAppear();
-	void openRyan();
 	void useFullCart();
 	void newPlace();
 	void useCardReader1();
@@ -798,7 +793,6 @@ public:
 	void initialMonCols();
 	void checkForShake();
 	void useButtonA();
-	void openEden();
 	void execCommand();
 	void obsThatDoThings();
 	void updateSymbolBot();
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index c70a5ca160..5e1c54be6d 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -75,10 +75,6 @@ void DreamGenContext::showKeypad() {
 	}
 }
 
-void DreamGenContext::enterCode() {
-	enterCode(al, ah, cl, ch);
-}
-
 bool DreamGenContext::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
 	
 	return digit0 == data.byte(kPresslist+0) && digit1 == data.byte(kPresslist+1)
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 046e7bd961..a4eb596ede 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -462,7 +462,6 @@
 	void addToPressList();
 	bool isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
 	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
-	void enterCode();
 	unsigned int scanForNames();
 	void doLoad(int slot);
 	void loadOld();
@@ -513,5 +512,11 @@
 	void selectSlot2();
 	void blank();
 	void allPointer();
+	void openYourNeighbour();
+	void openRyan();
+	void openPoolBoss();
+	void openEden();
+	void openSarters();
+	void openLouis();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 467f8673b5..e8c9f508cd 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -490,5 +490,35 @@ void DreamGenContext::callEdensDLift() {
 	}
 }
 
+void DreamGenContext::openYourNeighbour() {
+	enterCode(255, 255, 255, 255);
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::openRyan() {
+	enterCode(5, 1, 0, 6);
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::openPoolBoss() {
+	enterCode(5, 2, 2, 2);
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::openEden() {
+	enterCode(2, 8, 6, 5);
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::openSarters() {
+	enterCode(7, 8, 3, 3);
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::openLouis() {
+	enterCode(5, 2, 3, 8);
+	data.byte(kGetback) = 1;
+}
+
 } /*namespace dreamgen */