From 7b71bb6444533b01ac992b1fcfcb303625529ca5 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 7 Dec 2011 10:53:14 +0100
Subject: DREAMWEB: Pass data segment as SegmentRef to Context constructor

And not as SegmentPtr.
---
 devtools/tasmrecover/tasm/cpp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'devtools')

diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index 24d353561a..e72779fa29 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -644,7 +644,7 @@ namespace %s {
 """
 class %sContext : public DreamBase, public Context {
 public:
-	DreamGenContext() : DreamBase(), Context(_realData) {}
+	DreamGenContext() : DreamBase(), Context(data) {}
 
 	void __start();
 """
-- 
cgit v1.2.3


From 641e1bff5948416e6cab9c06ad4539ebf95c8bb4 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 7 Dec 2011 10:58:36 +0100
Subject: DREAMWEB: Make DreamBase::engine protected

---
 devtools/tasmrecover/tasm/cpp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'devtools')

diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index e72779fa29..e507fd451d 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -644,7 +644,7 @@ namespace %s {
 """
 class %sContext : public DreamBase, public Context {
 public:
-	DreamGenContext() : DreamBase(), Context(data) {}
+	DreamGenContext(DreamWeb::DreamWebEngine *en) : DreamBase(en), Context(data) {}
 
 	void __start();
 """
-- 
cgit v1.2.3


From f37b7486768b57c3281c10409c4588d6188ef40c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 7 Dec 2011 11:02:23 +0100
Subject: DREAMWEB: Merge DreamWeb::fadeDos into DreamGenContext::fadeDOS

---
 devtools/tasmrecover/tasm-recover | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'devtools')

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 37f3bb4769..2f58475398 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -274,6 +274,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'examineobtext',
 	'facerightway',
 	'fadecalculation',
+	'fadedos',
 	'fadescreenup',
 	'fadescreenups',
 	'fadescreenuphalf',
@@ -707,7 +708,6 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'openfilefromc' : 'openFileFromC',
 	'gettime' : 'getTime',
 	'loadtraveltext' : 'loadTravelText',
-	'fadedos' : 'fadeDOS',
 	'drawfloor' : 'drawFloor',
 	'loadkeypad' : 'loadKeypad',
 	'findtext1' : 'findText1',
-- 
cgit v1.2.3


From 3056c39a7589903acbf870b8f054373411cbd582 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 7 Dec 2011 11:43:07 +0100
Subject: DREAMWEB: Convert volumeAdjust

---
 devtools/tasmrecover/tasm-recover | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'devtools')

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 2f58475398..78630f8668 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -647,6 +647,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'usewinch',
 	'usewindow',
 	'viewfolder',
+	'volumeadjust',
 	'waitframes',
 	'walkandexamine',
 	'walking',
@@ -1130,7 +1131,6 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'intromusic' : 'introMusic',
 	'quitkey' : 'quitKey',
 	'processtrigger' : 'processTrigger',
-	'volumeadjust' : 'volumeAdjust',
 	'randomnum2' : 'randomNum2',
 	'loadsecondsample' : 'loadSecondSample',
 	'transfercontoex' : 'transferConToEx',
-- 
cgit v1.2.3