[Scummvm-cvs-logs] scummvm master -> 1b194dabae96a7ead1b3fe7a7d5f931d93519b2d

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1b194dabae DREAMWEB: Blacklist 'setMode' function.


Commit: 1b194dabae96a7ead1b3fe7a7d5f931d93519b2d
    https://github.com/scummvm/scummvm/commit/1b194dabae96a7ead1b3fe7a7d5f931d93519b2d
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-05T16:03:32-08:00

Commit Message:
DREAMWEB: Blacklist 'setMode' function.

This function was already implemented in C++, but it's header is now in
stubs.h rather than dreamgen.h

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.h
    engines/dreamweb/stubs.h



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 708845d..9a0b397 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 928fffd..18732cf 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 7999050..87b41e0 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -479,5 +479,6 @@
 	void clearBeforeLoad();
 	void clearReels();
 	void getRidOfReels();
+	void setMode();
 
 #endif