aboutsummaryrefslogtreecommitdiff
path: root/engines/dreamweb/sprite.cpp
diff options
context:
space:
mode:
authorBertrand Augereau2011-12-03 16:22:10 +0100
committerBertrand Augereau2011-12-03 16:27:46 +0100
commit85c6efe5c544993724ba027022adebe6b08bf6be (patch)
tree73a4136dd0110dd9981a234201bf62408cbbe3e5 /engines/dreamweb/sprite.cpp
parentfba69d5839c3f9ecf1241d90c833106059f7c876 (diff)
downloadscummvm-rg350-85c6efe5c544993724ba027022adebe6b08bf6be.tar.gz
scummvm-rg350-85c6efe5c544993724ba027022adebe6b08bf6be.tar.bz2
scummvm-rg350-85c6efe5c544993724ba027022adebe6b08bf6be.zip
DREAMWEB: 'maleFan' and 'femaleFan' ported to C++
Diffstat (limited to 'engines/dreamweb/sprite.cpp')
-rw-r--r--engines/dreamweb/sprite.cpp18
1 files changed, 14 insertions, 4 deletions
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 8b4bc7f7bf..b2ac6f5c9e 100644
--- 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;