diff options
| author | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
| commit | e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5 (patch) | |
| tree | 9d57b5fdd6737bc3449851a87e573abe7be984a6 /devtools/tasmrecover | |
| parent | deab5b28753155863062746ef1239535f562fd0b (diff) | |
| parent | 842b471e45ae8b7c1b4516b9bd5bf39d61112077 (diff) | |
| download | scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.gz scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.bz2 scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'devtools/tasmrecover')
| -rw-r--r-- | devtools/tasmrecover/dreamweb/object.asm | 5 | ||||
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 37 |
2 files changed, 42 insertions, 0 deletions
diff --git a/devtools/tasmrecover/dreamweb/object.asm b/devtools/tasmrecover/dreamweb/object.asm index e6f8037579..807a100052 100644 --- a/devtools/tasmrecover/dreamweb/object.asm +++ b/devtools/tasmrecover/dreamweb/object.asm @@ -336,11 +336,16 @@ waitexam: ;call delpointer jz notuseinv mov bx,offset cs:withlist1 notuseinv: call checkcoords + + cmp quitrequested, 0 + jnz stopwaiting + cmp examagain,0 jz norex jmp examineagain norex: cmp getback,0 jz waitexam +stopwaiting: mov pickup,0 cmp watchingtime,0 diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 744e285fbf..c4bcbb176c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -51,6 +51,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'printchar', 'printdirect', 'printslow', + 'printmessage', 'usetimedtext', 'dumptimedtext', 'setuptimedtemp', @@ -107,6 +108,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'doblocks', 'checkifperson', 'checkiffree', + 'checkifex', 'getreelstart', 'findobname', 'copyname', @@ -142,9 +144,11 @@ generator = cpp(context, "DreamGen", blacklist = [ 'placesetobject', 'removesetobject', 'showallfree', + 'showallex', 'adjustlen', 'finishedwalking', 'checkone', + 'getblockofpixel', 'getflagunderp', 'walkandexamine', 'obname', @@ -162,6 +166,39 @@ generator = cpp(context, "DreamGen", blacklist = [ 'readmouse4', 'waitframes', 'drawflags', + 'addtopeoplelist', + 'getexpos', + 'paneltomap', + 'maptopanel', + 'dumpmap', + 'obpicture', + 'delthisone', + 'transferinv', + 'obicons', + 'compare', + 'pixelcheckset', + 'turnpathon', + 'turnpathoff', + 'turnanypathon', + 'turnanypathoff', + 'isitdescribed', + 'checkifset', + 'checkifpathison', + 'delsprite', + 'dumpeverything', + 'isitworn', + 'makeworn', + 'obtoinv', + 'showryanpage', + 'findallryan', + 'fillryan', + 'useroutine', + 'hangon', + 'hangonp', + 'findnextcolon', + 'usetext', + 'bresenhams', + 'examineobtext', ], skip_output = [ # These functions are processed but not output 'dreamweb', |