Merge remote-tracking branch 'origin/master' into soltys_wip2

1 files changed, 132 insertions, 3 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 5f7a528a5b..8e37b4e851 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -1,5 +1,26 @@
 #!/usr/bin/python
 
+# ScummVM - Graphic Adventure Engine
+#
+# ScummVM is the legal property of its developers, whose names
+# are too numerous to list here. Please refer to the COPYRIGHT
+# file distributed with this source distribution.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+
 from tasm.parser import parser
 from tasm.cpp import cpp
 
@@ -8,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',
@@ -15,15 +37,122 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'multiget',
 	'multiput',
 	'multidump',
-	'frameoutnm', 
-	'cls', 
+	'frameoutnm',
+	'frameoutbh',
+	'frameoutfx',
+	'cls',
+	'clearwork',
 	'printundermon',
+	'kernchars',
+	'getnextword',
+	'getnumber',
+	'dumptextline',
+	'printboth',
+	'printchar',
+	'printdirect',
+	'printslow',
+	'usetimedtext',
+	'dumptimedtext',
+	'setuptimedtemp',
+	'putundertimed',
+	'getundertimed',
 	'worktoscreen',
 	'width160',
 	'convertkey',
 	'readabyte',
 	'readoneblock',
+	'printsprites',
+	'printasprite',
+	'eraseoldobs',
+	'clearsprites',
+	'makesprite',
+	'showframe',
+	'initman',
+	'aboutturn',
+	'readheader',
+	'fillspace',
+	'getroomdata',
+	'startloading',
+	'showreelframe',
+	'showgamereel',
+	'getreelframeax',
+	'findsource',
+	'walking',
+	'autosetwalk',
+	'checkdest',
+	'spriteupdate',
+	'dodoor',
+	'lockeddoorway',
+	'liftsprite',
 	'frameoutv',
-	'modifychar'
+	'modifychar',
+	'allocatework',
+	'lockmon',
+	'cancelch0',
+	'cancelch1',
+	'getroomspaths',
+	'makebackob',
+	'dealwithspecial',
+	'plotreel',
+	'facerightway',
+	'zoom',
+	'crosshair',
+	'showrain',
+	'domix',
+	'channel0tran',
+	'makenextblock',
+	'loopchannel0',
+	'parseblaster',
+	'deltextline',
+	'doblocks',
+	'checkifperson',
+	'checkiffree',
+	'getreelstart',
+	'findobname',
+	'copyname',
+	'commandwithob',
+	'showpanel',
+	'updatepeople',
+	'madmantext',
+	'madmode',
+	'movemap',
+	'doorway',
+	'widedoor',
+	'showallobs',
+	'addalong',
+	'addlength',
+	'getdimension',
+	'getxad',
+	'getyad',
+	'getmapad',
+	'calcmapad',
+	'calcfrframe',
+	'finalframe',
+	'commandonly',
+	'makename',
+	'findlen',
+	'blocknametext',
+	'walktotext',
+	'personnametext',
+	'findxyfrompath',
+	'findormake',
+	'setallchanges',
+	'dochange',
+	'deletetaken',
+	'placesetobject',
+	'removesetobject',
+	'showallfree',
+	'adjustlen',
+	'finishedwalking',
+	'checkone',
+	], skip_output = [
+	# These functions are processed but not output
+	'dreamweb',
+	'backobject',
+	'mainman',
+	'madman',
+	'loadgame',
+	'savegame',
+	'doload'
 	])
 generator.generate('dreamweb') #start routine