diff options
| author | D G Turner | 2011-12-06 00:03:32 +0000 |
|---|---|---|
| committer | D G Turner | 2011-12-06 00:03:32 +0000 |
| commit | 1b194dabae96a7ead1b3fe7a7d5f931d93519b2d (patch) | |
| tree | 28f86c0a5ee07f0dd126c746d163b96966ae7fd1 | |
| parent | e8ea99cd8ec9a34d687081afa17ef1e4d65d2a4e (diff) | |
| download | scummvm-rg350-1b194dabae96a7ead1b3fe7a7d5f931d93519b2d.tar.gz scummvm-rg350-1b194dabae96a7ead1b3fe7a7d5f931d93519b2d.tar.bz2 scummvm-rg350-1b194dabae96a7ead1b3fe7a7d5f931d93519b2d.zip | |
DREAMWEB: Blacklist 'setMode' function.
This function was already implemented in C++, but it's header is now in
stubs.h rather than dreamgen.h
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 13 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 708845dac7..9a0b3979a2 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -464,6 +464,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'seecommandtail', 'setallchanges', 'setlocation', + 'setmode', 'setsoundoff', 'setupemm', 'setuppit', diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 928fffd150..18732cf2d5 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -552,7 +552,6 @@ public: void decide(); void entryTexts(); void checkInput(); - void setMode(); void getBackFromOps(); void openSarters(); void putUnderCentre(); @@ -566,7 +565,7 @@ public: void fadeDOS(); void findText1(); void isRyanHolding(); - void interruptTest(); + void showSlots(); void useCashCard(); void useWall(); void openTomb(); @@ -576,8 +575,6 @@ public: void introMonks1(); void resetLocation(); void introMonks2(); - void advisor(); - void additionalText(); void useElevator5(); void greyscaleSum(); void useElevator2(); @@ -651,7 +648,7 @@ public: void lockLightOff(); void wearWatch(); void runIntroSeq(); - void nextColon(); + void advisor(); void attendant(); void monks2text(); void clearPalette(); @@ -660,6 +657,7 @@ public: void openHotelDoor(); void blank(); void drinker(); + void nextColon(); void placeFreeObject(); void allPalette(); void adjustRight(); @@ -736,9 +734,10 @@ public: void useLadder(); void afterIntroRoom(); void findAllOpen(); + void quitSymbol(); void readFromFile(); void initialInv(); - void quitSymbol(); + void interruptTest(); void setTopRight(); void findSetObject(); void useDiary(); @@ -794,13 +793,13 @@ public: void nextDest(); void makeCaps(); void read(); + void additionalText(); void hotelControl(); void mugger(); void gettingShot(); void setTopLeft(); void searchForString(); void selectOpenOb(); - void showSlots(); void useGun(); void autoAppear(); void openRyan(); diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 799905072f..87b41e04c6 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -479,5 +479,6 @@ void clearBeforeLoad(); void clearReels(); void getRidOfReels(); + void setMode(); #endif |