diff options
| author | Eugene Sandulenko | 2011-08-14 04:17:51 -0700 |
|---|---|---|
| committer | Eugene Sandulenko | 2011-08-14 04:17:51 -0700 |
| commit | 3de0b4e3f2c762128fdf9c9e6954af4b8abffbda (patch) | |
| tree | 71c482beec4df56892b822abcce5587bb10e4d3a /devtools | |
| parent | da76e6133680d23b01ca2d361fae1f95018dab10 (diff) | |
| parent | b08b31eed3e31fb485a9091829f23cfb9006551f (diff) | |
| download | scummvm-rg350-3de0b4e3f2c762128fdf9c9e6954af4b8abffbda.tar.gz scummvm-rg350-3de0b4e3f2c762128fdf9c9e6954af4b8abffbda.tar.bz2 scummvm-rg350-3de0b4e3f2c762128fdf9c9e6954af4b8abffbda.zip | |
Merge pull request #60 from tramboi/master
DREAMWEB: Fixes, cleaning and more functions ported to C++
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/tasmrecover/dreamweb/sprite.asm | 2 | ||||
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 37 |
2 files changed, 35 insertions, 4 deletions
diff --git a/devtools/tasmrecover/dreamweb/sprite.asm b/devtools/tasmrecover/dreamweb/sprite.asm index 22840dc8d4..06b06c76e3 100644 --- a/devtools/tasmrecover/dreamweb/sprite.asm +++ b/devtools/tasmrecover/dreamweb/sprite.asm @@ -4226,7 +4226,7 @@ botofdoor2: sub ah,ch opendoor2: cmp throughdoor,1 jz mustbeopen cmp lockstatus,1 - jz shutdoor + jz shutdoor2 mustbeopen: mov cl,[es:bx+19] cmp cl,1 jnz notdoorsound4 diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 183792b5df..3a9d4f462c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -40,7 +40,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'frameoutnm', 'frameoutbh', 'frameoutfx', - 'cls', + 'cls', + 'clearwork', 'printundermon', 'kernchars', 'getnextword', @@ -51,6 +52,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'printdirect', 'printslow', 'usetimedtext', + 'dumptimedtext', + 'setuptimedtemp', 'putundertimed', 'getundertimed', 'worktoscreen', @@ -65,17 +68,45 @@ generator = cpp(context, "DreamGen", blacklist = [ 'makesprite', 'showframe', 'initman', + 'aboutturn', + 'readheader', + 'fillspace', + 'getroomdata', + 'startloading', + 'showreelframe', + 'findsource', 'walking', + 'autosetwalk', + 'checkdest', 'spriteupdate', 'dodoor', + 'lockeddoorway', 'liftsprite', 'frameoutv', 'modifychar', + 'allocatework', 'lockmon', 'cancelch0', - 'cancelch1' + 'cancelch1', + 'getroomspaths', + 'makebackob', + 'dealwithspecial', + 'plotreel', + 'facerightway', + 'zoom', + 'crosshair', + 'showrain', + 'domix', + 'channel0tran', + 'makenextblock', + 'loopchannel0', + 'parseblaster', + 'deltextline', + 'doblocks', ], skip_output = [ # These functions are processed but not output - 'dreamweb' + 'dreamweb', + 'backobject', + 'mainman', ]) generator.generate('dreamweb') #start routine |