diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 2 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 12 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 4 | ||||
| -rw-r--r-- | engines/dreamweb/sprite.cpp | 65 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 |
5 files changed, 38 insertions, 46 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 1705a4eed0..124ec8fa5b 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -336,6 +336,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'worktoscreenm', 'checkspeed', 'sparkydrip', + 'othersmoker', + 'barwoman', ], skip_output = [ # These functions are processed but not output 'dreamweb', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index b98726ee85..8143c8f4b2 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -322,18 +322,6 @@ notgotgun: addtopeoplelist(); } -void DreamGenContext::othersmoker() { - STACK_CHECK; - showgamereel(); - addtopeoplelist(); -} - -void DreamGenContext::barwoman() { - STACK_CHECK; - showgamereel(); - addtopeoplelist(); -} - void DreamGenContext::interviewer() { STACK_CHECK; _cmp(data.word(kReeltowatch), 68); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 51acfd7e7a..0e472e284c 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -469,8 +469,6 @@ public: static const uint16 addr_rockstar = 0xc058; static const uint16 addr_soldier1 = 0xc054; static const uint16 addr_interviewer = 0xc050; - static const uint16 addr_barwoman = 0xc04c; - static const uint16 addr_othersmoker = 0xc048; static const uint16 addr_bartender = 0xc044; static const uint16 addr_drinker = 0xc040; static const uint16 addr_tattooman = 0xc03c; @@ -1150,7 +1148,6 @@ public: void intromonks2(); void advisor(); void additionaltext(); - void othersmoker(); void dofade(); void useelevator5(); void useelevator4(); @@ -1477,7 +1474,6 @@ public: void searchforfiles(); void monkspeaking(); void clearrest(); - void barwoman(); void credits(); void madmanrun(); void randomnum1(); diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index 9043409083..584fa18dc2 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -578,7 +578,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = { &DreamGenContext::bossman, &DreamGenContext::interviewer, &DreamGenContext::heavy, &DreamGenContext::manasleep2, &DreamGenContext::mansatstill, &DreamGenContext::drinker, - &DreamGenContext::bartender, &DreamGenContext::othersmoker, + &DreamGenContext::bartender, NULL, &DreamGenContext::tattooman, &DreamGenContext::attendant, &DreamGenContext::keeper, &DreamGenContext::candles1, &DreamGenContext::smallcandle, &DreamGenContext::security, @@ -600,35 +600,35 @@ static void (DreamGenContext::*reelCallbacks[57])() = { }; static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = { - NULL, &DreamGenContext::sparkydrip, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL, NULL, - NULL + /*&DreamGenContext::gamer*/NULL, &DreamGenContext::sparkydrip, + /*&DreamGenContext::eden*/NULL, /*&DreamGenContext::edeninbath*/NULL, + /*&DreamGenContext::sparky*/NULL, /*&DreamGenContext::smokebloke*/NULL, + /*&DreamGenContext::manasleep*/NULL, /*&DreamGenContext::drunk*/NULL, + /*&DreamGenContext::receptionist*/NULL, /*&DreamGenContext::malefan*/NULL, + /*&DreamGenContext::femalefan*/NULL, /*&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::tattooman*/NULL, /*&DreamGenContext::attendant*/NULL, + /*&DreamGenContext::keeper*/NULL, /*&DreamGenContext::candles1*/NULL, + /*&DreamGenContext::smallcandle*/NULL, /*&DreamGenContext::security*/NULL, + /*&DreamGenContext::copper*/NULL, /*&DreamGenContext::poolguard*/NULL, + /*&DreamGenContext::rockstar*/NULL, /*&DreamGenContext::businessman*/NULL, + /*&DreamGenContext::train*/NULL, /*&DreamGenContext::aide*/NULL, + /*&DreamGenContext::mugger*/NULL, /*&DreamGenContext::helicopter*/NULL, + /*&DreamGenContext::intromagic1*/NULL, /*&DreamGenContext::intromusic*/NULL, + /*&DreamGenContext::intromagic2*/NULL, /*&DreamGenContext::candles2*/NULL, + /*&DreamGenContext::gates*/NULL, /*&DreamGenContext::intromagic3*/NULL, + /*&DreamGenContext::intromonks1*/NULL, /*&DreamGenContext::candles*/NULL, + /*&DreamGenContext::intromonks2*/NULL, /*&DreamGenContext::handclap*/NULL, + /*&DreamGenContext::monkandryan*/NULL, /*&DreamGenContext::endgameseq*/NULL, + /*&DreamGenContext::priest*/NULL, /*&DreamGenContext::madman*/NULL, + /*&DreamGenContext::madmanstelly*/NULL, /*&DreamGenContext::alleybarksound*/NULL, + /*&DreamGenContext::foghornsound*/NULL, /*&DreamGenContext::carparkdrip*/NULL, + /*&DreamGenContext::carparkdrip*/NULL, /*&DreamGenContext::carparkdrip*/NULL, + /*&DreamGenContext::carparkdrip*/NULL }; void DreamGenContext::updatepeople() { @@ -1082,5 +1082,10 @@ void DreamGenContext::sparkydrip(ReelRoutine &routine) { playchannel0(14, 0); } +void DreamGenContext::othersmoker(ReelRoutine &routine) { + showgamereel(&routine); + addtopeoplelist(&routine); +} + } /*namespace dreamgen */ diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 9f7bce4af9..1512c30000 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -378,4 +378,5 @@ bool checkspeed(ReelRoutine *routine); void checkspeed(); void sparkydrip(ReelRoutine &routine); + void othersmoker(ReelRoutine &routine); |