Merge remote-tracking branch 'official/master'

Conflicts:
	devtools/tasmrecover/tasm-recover

2 files changed, 8 insertions, 2 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index f550cb0826..278e4465d5 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -29,6 +29,7 @@ p.strip_path = 3
 context = p.parse('dreamweb/dreamweb.asm')
 p.link()
 generator = cpp(context, "DreamGen", blacklist = [
+	# These functions are not processed
 	'randomnumber',
 	'quickquit',
 	'quickquit2',
@@ -77,5 +78,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'getroomspaths',
 	'makebackob',
 	'facerightway',
+	], skip_output = [
+	# These functions are processed but not output
+	'dreamweb'
 	])
 generator.generate('dreamweb') #start routine
diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index a73fd6c890..4ed89f650d 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -33,7 +33,7 @@ def parse_bin(s):
 	return v
 
 class cpp:
-	def __init__(self, context, namespace, skip_first = 0, blacklist = []):
+	def __init__(self, context, namespace, skip_first = 0, blacklist = [], skip_output = []):
 		self.namespace = namespace
 		fname = namespace.lower() + ".cpp"
 		header = namespace.lower() + ".h"
@@ -79,6 +79,7 @@ class cpp:
 		self.proc_done = []
 		self.blacklist = blacklist
 		self.failed = list(blacklist)
+		self.skip_output = skip_output
 		self.translated = []
 		self.proc_addr = []
 		self.methods = []
@@ -527,7 +528,8 @@ namespace %s {
 				self.proc.optimize(keep_labels=[label])
 				self.proc.visit(self, start)
 			self.body += "}\n";
-			self.translated.insert(0, self.body)
+			if name not in self.skip_output:
+				self.translated.insert(0, self.body)
 			self.proc = None
 			if self.temps_count > 0:
 				raise Exception("temps count == %d at the exit of proc" %self.temps_count);