[Scummvm-cvs-logs] scummvm master -> 652c025db04e3283a97198e82be546f82062b923

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
652c025db0 DREAMWEB: Merged several simple NPC functions into genericPerson()


Commit: 652c025db04e3283a97198e82be546f82062b923
    https://github.com/scummvm/scummvm/commit/652c025db04e3283a97198e82be546f82062b923
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-05T11:50:57-08:00

Commit Message:
DREAMWEB: Merged several simple NPC functions into genericPerson()

Changed paths:
    engines/dreamweb/people.cpp
    engines/dreamweb/stubs.h



diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 3122984..ebf1adf 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -61,13 +61,13 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::eden, /*&DreamGenContext::edenInBath*/NULL,
 	&DreamGenContext::sparky, &DreamGenContext::smokeBloke,
 	&DreamGenContext::manAsleep, &DreamGenContext::drunk,
-	/*&DreamGenContext::receptionist*/NULL, &DreamGenContext::maleFan,
-	&DreamGenContext::femaleFan, /*&DreamGenContext::louis*/NULL,
+	/*&DreamGenContext::receptionist*/NULL, &DreamGenContext::genericPerson /*maleFan*/,
+	&DreamGenContext::genericPerson /*femaleFan*/, /*&DreamGenContext::louis*/NULL,
 	/*&DreamGenContext::louisChair*/NULL, /*&DreamGenContext::soldier1*/NULL,
 	/*&DreamGenContext::bossMan*/NULL, /*&DreamGenContext::interviewer*/NULL,
 	/*&DreamGenContext::heavy*/NULL, /*&DreamGenContext::manAsleep2*/NULL,
 	/*&DreamGenContext::manSatStill*/NULL, /*&DreamGenContext::drinker*/NULL,
-	/*&DreamGenContext::bartender*/NULL, &DreamGenContext::otherSmoker,
+	/*&DreamGenContext::bartender*/NULL, &DreamGenContext::genericPerson /*otherSmoker*/,
 	/*&DreamGenContext::tattooMan*/NULL, /*&DreamGenContext::attendant*/NULL,
 	/*&DreamGenContext::keeper*/NULL, /*&DreamGenContext::candles1*/NULL,
 	/*&DreamGenContext::smallcandle*/NULL, &DreamGenContext::security,
@@ -225,7 +225,7 @@ void DreamGenContext::sparkyDrip(ReelRoutine &routine) {
 		playChannel0(14, 0);
 }
 
-void DreamGenContext::otherSmoker(ReelRoutine &routine) {
+void DreamGenContext::genericPerson(ReelRoutine &routine) {
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 }
@@ -250,16 +250,6 @@ 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
index 8ee093d..73bd68e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -393,12 +393,10 @@
 	bool checkSpeed(ReelRoutine &routine);
 	void checkSpeed();
 	void sparkyDrip(ReelRoutine &routine);
-	void otherSmoker(ReelRoutine &routine);
+	void genericPerson(ReelRoutine &routine);
 	void gamer(ReelRoutine &routine);
 	void eden(ReelRoutine &routine);
 	void sparky(ReelRoutine &routine);
-	void femaleFan(ReelRoutine &routine);
-	void maleFan(ReelRoutine &routine);
 	void rockstar(ReelRoutine &routine);
 	void madmansTelly(ReelRoutine &routine);
 	void smokeBloke(ReelRoutine &routine);