diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 4 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/people.cpp | 7 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 |
5 files changed, 7 insertions, 7 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 76b49d6c53..9dcaa8cbb3 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -302,6 +302,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'getundertimed', 'getxad', 'getyad', + 'handclap', 'hangon', 'hangoncurs', 'hangone', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index c6a0950379..dbeab6716a 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -928,10 +928,6 @@ intromonk2fin: showGameReel(); } -void DreamGenContext::handClap() { - STACK_CHECK; -} - void DreamGenContext::monks2text() { STACK_CHECK; _cmp(data.byte(kIntrocount), 1); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index fd294f6be4..ac8256aa85 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -738,7 +738,6 @@ public: void useElvDoor(); void putBackObStuff(); void useLadder(); - void handClap(); void afterIntroRoom(); void findAllOpen(); void readFromFile(); diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp index c0b0b7a42c..83533c6a2d 100644 --- a/engines/dreamweb/people.cpp +++ b/engines/dreamweb/people.cpp @@ -47,7 +47,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = { &DreamGenContext::introMagic2, &DreamGenContext::candles2, NULL, &DreamGenContext::introMagic3, &DreamGenContext::introMonks1, NULL, - &DreamGenContext::introMonks2, &DreamGenContext::handClap, + &DreamGenContext::introMonks2, NULL, &DreamGenContext::monkAndRyan, &DreamGenContext::endGameSeq, &DreamGenContext::priest, NULL, NULL, &DreamGenContext::alleyBarkSound, @@ -79,7 +79,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = { /*&DreamGenContext::introMagic2*/NULL, /*&DreamGenContext::candles2*/NULL, &DreamGenContext::gates, /*&DreamGenContext::introMagic3*/NULL, /*&DreamGenContext::intromonks1*/NULL, &DreamGenContext::candles, - /*&DreamGenContext::intromonks2*/NULL, /*&DreamGenContext::handClap*/NULL, + /*&DreamGenContext::intromonks2*/NULL, &DreamGenContext::handClap, /*&DreamGenContext::monkAndRyan*/NULL, /*&DreamGenContext::endGameSeq*/NULL, /*&DreamGenContext::priest*/NULL, &DreamGenContext::madman, &DreamGenContext::madmansTelly, /*&DreamGenContext::alleyBarkSound*/NULL, @@ -445,5 +445,8 @@ void DreamGenContext::louis(ReelRoutine &routine) { addToPeopleList(&routine); } +void DreamGenContext::handClap(ReelRoutine &routine) { +} + } /*namespace dreamgen */ diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index f20117b991..310aaaf3be 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -417,6 +417,7 @@ void security(ReelRoutine &routine); void edenInBath(ReelRoutine &routine); void louis(ReelRoutine &routine); + void handClap(ReelRoutine &routine); void singleKey(uint8 key, uint16 x, uint16 y); void loadSaveBox(); void loadKeypad(); |