[Scummvm-cvs-logs] scummvm master -> b775915af8228670b942ecfce10ed13264577382

[tramboi]

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:
b775915af8 DREAMWEB: 'madman' blacklisted


Commit: b775915af8228670b942ecfce10ed13264577382
    https://github.com/scummvm/scummvm/commit/b775915af8228670b942ecfce10ed13264577382
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-03T09:15:39-08:00

Commit Message:
DREAMWEB: 'madman' blacklisted

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 2400b5f..3d54563 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -203,6 +203,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'lockmon',
 	'look',
 	'loopchannel0',
+	'madman',
 	'madmantext',
 	'madmode',
 	'makebackob',
@@ -376,7 +377,6 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'dreamweb',
 	'backobject',
 	'mainman',
-	'madman',
 	'loadgame',
 	'savegame',
 	'zoomonoff',
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 833e76b..6acfb8e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -842,7 +842,6 @@ public:
 	void diaryKeyN();
 	void set16ColPalette();
 	void purgeAnItem();
-	void madman();
 	void enableSoundInt();
 	void volumeAdjust();
 	void madmansTelly();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9adad3d..6b3881b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -164,6 +164,7 @@
 	void commandWithOb(uint8 command, uint8 type, uint8 index);
 	void showPanel();
 	void updatePeople();
+	void madman();
 	void madmanText();
 	void madMode();
 	void moveMap(uint8 param);