[Scummvm-cvs-logs] scummvm master -> 9bf5a1930de387c32bce788a8ccdc1f9db5b3681

[wjp]

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:
9bf5a1930d DREAMWEB: Blacklist the main dreamweb function


Commit: 9bf5a1930de387c32bce788a8ccdc1f9db5b3681
    https://github.com/scummvm/scummvm/commit/9bf5a1930de387c32bce788a8ccdc1f9db5b3681
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-26T16:48:40-08:00

Commit Message:
DREAMWEB: Blacklist the main dreamweb function

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 2ab3dd6..ac63e7e 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -429,6 +429,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'drawflags',
 	'drawfloor',
 	'drawitall',
+	'dreamweb',
 	'drinker',
 	'droperror',
 	'dropobject',
@@ -1031,7 +1032,6 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'zoomonoff',
 	], skip_output = [
 	# These functions are processed but not output
-	'dreamweb',
 	], skip_dispatch_call = True, skip_addr_constants = True,
 	header_omit_blacklisted = True,
 	function_name_remapping = {
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 629dde2..a68c5cd 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -412,7 +412,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	void dreamweb();
 };
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 785e737..c9eaf26 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -22,6 +22,7 @@
 #ifndef DREAMWEB_STUBS_H
 #define DREAMWEB_STUBS_H
 
+	void dreamweb();
 	void screenUpdate();
 	void startup1();
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {