diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 6 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 10 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 11 |
3 files changed, 9 insertions, 18 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 37f3bb4769..88a8ab0e49 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -200,6 +200,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'checkifperson', 'checkifset', 'checkone', + 'checksoundint', 'checkspeed', 'chewy', 'clearbeforeload', @@ -233,6 +234,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'delthisone', 'destselect', 'disablepath', + 'disablesoundint', 'dmaend', 'doblocks', 'dochange', @@ -261,6 +263,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'eden', 'edeninbath', 'edenscdplayer', + 'enablesoundint', 'endpaltostart', 'entercode', 'entersymbol', @@ -348,6 +351,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'initman', 'initrain', 'input', + 'interupttest', 'intro', 'intro1text', 'intro2text', @@ -576,7 +580,9 @@ generator = cpp(context, "DreamGen", blacklist = [ 'slabdoorf', 'smokebloke', 'sortoutmap', + 'soundend', 'soundonreels', + 'soundstartup', 'sparky', 'sparkydrip', 'splitintolines', diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index a5be8ec8ea..7fb2bc5838 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -576,7 +576,6 @@ public: void keyboardRead(); void getOpenedSize(); void resetKeyboard(); - void soundStartup(); void adjustUp(); void fadeScreenDownHalf(); void mouseCall(); @@ -599,7 +598,6 @@ public: void runTap(); void talk(); void dumpDiaryKeys(); - void disableSoundInt(); void checkForExit(); void lookInInterface(); void inToInv(); @@ -640,8 +638,8 @@ public: void useCooker(); void receptionist(); void selectSlot(); + void openFileNoCheck(); void fadeUpMon(); - void soundEnd(); void clearChanges(); void introMagic2(); void introMagic3(); @@ -657,7 +655,6 @@ public: void diaryKeyN(); void set16ColPalette(); void purgeAnItem(); - void enableSoundInt(); void purgeALocation(); void notHeldError(); void getSetAd(); @@ -675,15 +672,13 @@ public: void bossMan(); void searchForSame(); void fadeFromWhite(); - void checkSoundInt(); void rollEm(); void poolGuard(); void lookAtPlace(); void useAxe(); void findAllOpen(); - void quitSymbol(); void readFromFile(); - void interruptTest(); + void quitSymbol(); void findSetObject(); void useDiary(); void deleteExObject(); @@ -715,7 +710,6 @@ public: void swapWithOpen(); void dreamweb(); void dropError(); - void openFileNoCheck(); void checkInside(); void findPathOfPoint(); void getBack1(); diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index da02360e55..75adc72c44 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -472,7 +472,7 @@ void DreamGenContext::dreamweb() { } seeCommandTail(); - soundStartup(); + // soundStartup used to be done here... setKeyboardInt(); allocateBuffers(); setMouse(); @@ -1063,15 +1063,6 @@ void DreamGenContext::deallocateMem(uint16 segment) { } } -void DreamGenContext::soundStartup() {} -void DreamGenContext::soundEnd() {} -void DreamGenContext::interruptTest() {} -void DreamGenContext::disableSoundInt() {} -void DreamGenContext::enableSoundInt() {} -void DreamGenContext::checkSoundInt() { - data.byte(kTestresult) = 1; -} - void DreamGenContext::loadSpeech() { cancelCh1(); data.byte(kSpeechloaded) = 0; |