DREAMWEB: 'maleFan' and 'femaleFan' ported to C++

scummvm · Dec 3, 2011 · 85c6efe · 85c6efe
1 parent fba69d5
commit 85c6efe
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
@@ -124,6 +124,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'commandwithob',
 	'showpanel',
 	'updatepeople',
+	'malefan',
+	'femalefan',
 	'madmantext',
 	'madmode',
 	'movemap',

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
@@ -180,18 +180,6 @@ void DreamGenContext::edenInBath() {
 	addToPeopleList();
 }
 
-void DreamGenContext::maleFan() {
-	STACK_CHECK;
-	showGameReel();
-	addToPeopleList();
-}
-
-void DreamGenContext::femaleFan() {
-	STACK_CHECK;
-	showGameReel();
-	addToPeopleList();
-}
-
 void DreamGenContext::louis() {
 	STACK_CHECK;
 	_cmp(data.byte(kRockstardead), 0);

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
@@ -648,7 +648,6 @@ class DreamGenContext : public Context {
 
 	void useWire();
 	void getNamePos();
-	void femaleFan();
 	void identifyOb();
 	void useLighter();
 	void runEndSeq();
@@ -1033,7 +1032,6 @@ class DreamGenContext : public Context {
 	void allPointer();
 	void checkSoundInt();
 	void fadeScreenDown();
-	void maleFan();
 	void doSaveLoad();
 	void createName();
 	void readCityPic();

diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
@@ -570,8 +570,8 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	NULL, &DreamGenContext::edenInBath,
 	NULL, &DreamGenContext::smokeBloke,
 	&DreamGenContext::manAsleep, &DreamGenContext::drunk,
-	&DreamGenContext::receptionist, &DreamGenContext::maleFan,
-	&DreamGenContext::femaleFan, &DreamGenContext::louis,
+	&DreamGenContext::receptionist, NULL,
+	NULL, &DreamGenContext::louis,
 	&DreamGenContext::louisChair, &DreamGenContext::soldier1,
 	&DreamGenContext::bossMan, &DreamGenContext::interviewer,
 	&DreamGenContext::heavy, &DreamGenContext::manAsleep2,
@@ -602,8 +602,8 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::eden, /*&DreamGenContext::edenInBath*/NULL,
 	&DreamGenContext::sparky, /*&DreamGenContext::smokeBloke*/NULL,
 	/*&DreamGenContext::manAsleep*/NULL, /*&DreamGenContext::drunk*/NULL,
-	/*&DreamGenContext::receptionist*/NULL, /*&DreamGenContext::maleFan*/NULL,
-	/*&DreamGenContext::femaleFan*/NULL, /*&DreamGenContext::louis*/NULL,
+	/*&DreamGenContext::receptionist*/NULL, &DreamGenContext::maleFan,
+	&DreamGenContext::femaleFan, /*&DreamGenContext::louis*/NULL,
 	/*&DreamGenContext::louisChair*/NULL, /*&DreamGenContext::soldier1*/NULL,
 	/*&DreamGenContext::bossMan*/NULL, /*&DreamGenContext::interviewer*/NULL,
 	/*&DreamGenContext::heavy*/NULL, /*&DreamGenContext::manAsleep2*/NULL,
@@ -1105,6 +1105,16 @@ void DreamGenContext::eden(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
+void DreamGenContext::femaleFan(ReelRoutine &routine) {
+	showGameReel(&routine);
+	addToPeopleList(&routine);
+}
+
+void DreamGenContext::maleFan(ReelRoutine &routine) {
+	showGameReel(&routine);
+	addToPeopleList(&routine);
+}
+
 void DreamGenContext::sparky(ReelRoutine &routine) {
 	if (data.word(kCard1money))
 		routine.b7 = 3;

diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
@@ -384,6 +384,8 @@
 	void gamer(ReelRoutine &routine);
 	void eden(ReelRoutine &routine);
 	void sparky(ReelRoutine &routine);
+	void femaleFan(ReelRoutine &routine);
+	void maleFan(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void showKeypad();
 	void showOuterPad();