aboutsummaryrefslogtreecommitdiff
path: root/devtools/tasmrecover/tasm-recover
diff options
context:
space:
mode:
authorBertrand Augereau2011-07-29 00:58:25 +0200
committerBertrand Augereau2011-07-29 00:58:25 +0200
commit16348053c72ed27c91d7e758da9016697e06f164 (patch)
tree0a51893213bffab4e7d6e6de57deb804a326b7ac /devtools/tasmrecover/tasm-recover
parentbd986b8cfebda566863c1c24042c601669b4417c (diff)
parentea05f6804608b48798c0f5b40cec7324d1d490bd (diff)
downloadscummvm-rg350-16348053c72ed27c91d7e758da9016697e06f164.tar.gz
scummvm-rg350-16348053c72ed27c91d7e758da9016697e06f164.tar.bz2
scummvm-rg350-16348053c72ed27c91d7e758da9016697e06f164.zip
Merge remote-tracking branch 'official/master'
Conflicts: devtools/tasmrecover/tasm-recover
Diffstat (limited to 'devtools/tasmrecover/tasm-recover')
-rwxr-xr-xdevtools/tasmrecover/tasm-recover4
1 files changed, 4 insertions, 0 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