Merge pull request #60 from tramboi/master

DREAMWEB: Fixes, cleaning and more functions ported to C++
scummvm · Aug 14, 2011 · 3de0b4e · 3de0b4e
2 parents da76e61 + b08b31e
commit 3de0b4e
Show file tree

Hide file tree

Showing 12 changed files with 1,878 additions and 2,654 deletions.
diff --git 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
@@ -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