From 719f3ec1789005186c4cb86b10effa9ceee93866 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 15 Dec 2011 10:54:28 +0100
Subject: DREAMWEB: Convert a bunch of stuff to C++

Specifically, I started with openOb() and withWhat() which allowed to
remove offset_commandline and offset_openchangesize. A clean conversion of
these required a conversion of printMessage2 and getOpenedSize.
---
 devtools/tasmrecover/tasm-recover | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'devtools')

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 86414ddea0..64e7513f09 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -48,6 +48,8 @@ p = parser(skip_binary_data = [
 	'icongraphics1',
 	'savenames',
 	'volumetabname',
+	'commandline',
+	'openchangesize',
 	# keypad.asm
 	'keypadlist',
 	'symbollist',
@@ -438,6 +440,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'getnamepos',
 	'getnextword',
 	'getnumber',
+	'getopenedsize',
 	'getpersframe',
 	'getreelframeax',
 	'getreelstart',
@@ -592,6 +595,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'openhoteldoor2',
 	'openinv',
 	'openlouis',
+	'openob',
 	'openpoolboss',
 	'openryan',
 	'opensarters',
@@ -626,6 +630,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'printdirect',
 	'printlogo',
 	'printmessage',
+	'printmessage2',
 	'printoutermon',
 	'printslow',
 	'printsprites',
@@ -871,6 +876,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'wheelsound',
 	'widedoor',
 	'width160',
+	'withwhat',
 	'workoutframes',
 	'worktoscreen',
 	'worktoscreenm',
@@ -1349,7 +1355,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'printdirect' : 'printDirect',
 	'printlogo' : 'printLogo',
 	'printmessage' : 'printMessage',
-	'printmessage2' : 'printmessage2',
+	'printmessage2' : 'printMessage2',
 	'printoutermon' : 'printOuterMon',
 	'printslow' : 'printSlow',
 	'printsprites' : 'printSprites',
-- 
cgit v1.2.3


From d1ed87beceb68a2b33db9989e6a480bbda6a73d1 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 15 Dec 2011 14:09:53 +0100
Subject: DREAMWEB: Convert notHeldError to C++, move stuff to DreamBase

---
 devtools/tasmrecover/tasm-recover | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'devtools')

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 64e7513f09..d902e38d3d 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -157,11 +157,6 @@ p = parser(skip_binary_data = [
 	'increment2',
 	'keypadax',
 	'keypadcx',
-	'soundbuffer',
-	'cursloc',
-	'liftsoundcount',
-	'playblock',
-	'gotfrom',
 	# vgagrafx.asm
 	'cityname',
 	'extragraphics1',
@@ -473,7 +468,6 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'hangonpq',
 	'hangonw',
 	'heavy',
-	'helicopter',
 	'hotelbell',
 	'hotelcontrol',
 	'initialinv',
@@ -579,6 +573,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'nextdest',
 	'nextfolder',
 	'nextsymbol',
+	'nothelderror',
 	'obicons',
 	'obname',
 	'obpicture',
@@ -1298,7 +1293,6 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'nextdest' : 'nextDest',
 	'nextfolder' : 'nextFolder',
 	'nextsymbol' : 'nextSymbol',
-	'nothelderror' : 'notHeldError',
 	'obicons' : 'obIcons',
 	'obname' : 'obName',
 	'obpicture' : 'obPicture',
-- 
cgit v1.2.3