[Scummvm-cvs-logs] scummvm master -> 8cf4ba1ed699bc6f4ab8191590b1f1dd591e8a50

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1763415fe6 DREAMWEB: 'useWall' ported to C++
8cf4ba1ed6 DREAMWEB: 'dosreturn' has already been converted to C++


Commit: 1763415fe601de16bbf41ac7d99de5def117d55a
    https://github.com/scummvm/scummvm/commit/1763415fe601de16bbf41ac7d99de5def117d55a
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-05T18:54:59-08:00

Commit Message:
DREAMWEB: 'useWall' ported to C++

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/stubs.h
    engines/dreamweb/use.cpp



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index de7983e..1e6009b 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -582,6 +582,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'usetempcharset',
 	'usetext',
 	'usetimedtext',
+	'usewall',
 	'usewindow',
 	'viewfolder',
 	'waitframes',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 0129dbd..721a5f9 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -7470,62 +7470,6 @@ void DreamGenContext::setupTimedUse() {
 	data.word(kTimedoffset) = bx;
 }
 
-void DreamGenContext::useWall() {
-	STACK_CHECK;
-	showFirstUse();
-	_cmp(data.byte(kManspath), 3);
-	if (flags.z())
-		goto gobackover;
-	data.word(kWatchingtime) = 30*2;
-	data.word(kReeltowatch) = 2;
-	data.word(kEndwatchreel) = 31;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
-	al = 3;
-	turnPathOn();
-	al = 4;
-	turnPathOn();
-	al = 0;
-	turnPathOff();
-	al = 1;
-	turnPathOff();
-	al = 2;
-	turnPathOff();
-	al = 5;
-	turnPathOff();
-	data.byte(kManspath) = 3;
-	data.byte(kFinaldest) = 3;
-	findXYFromPath();
-	data.byte(kResetmanxy) = 1;
-	switchRyanOff();
-	return;
-gobackover:
-	data.word(kWatchingtime) = 30*2;
-	data.word(kReeltowatch) = 34;
-	data.word(kEndwatchreel) = 60;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
-	al = 3;
-	turnPathOff();
-	al = 4;
-	turnPathOff();
-	al = 0;
-	turnPathOn();
-	al = 1;
-	turnPathOn();
-	al = 2;
-	turnPathOn();
-	al = 5;
-	turnPathOn();
-	data.byte(kManspath) = 5;
-	data.byte(kFinaldest) = 5;
-	findXYFromPath();
-	data.byte(kResetmanxy) = 1;
-	switchRyanOff();
-}
-
 void DreamGenContext::useChurchGate() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 678a148..72ef492 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -564,7 +564,6 @@ public:
 	void isRyanHolding();
 	void showSlots();
 	void useCashCard();
-	void useWall();
 	void openTomb();
 	void doSomeTalk();
 	void getAnyAdDir();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a4eb596..80c7645 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -392,6 +392,7 @@
 	void wheelSound();
 	void callHotelLift();
 	void useShield();
+	void useWall();
 	void wearWatch();
 	void wearShades();
 	void checkFolderCoords();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index e8c9f50..15e9a04 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -520,5 +520,49 @@ void DreamGenContext::openLouis() {
 	data.byte(kGetback) = 1;
 }
 
+
+void DreamGenContext::useWall() {
+	showFirstUse();
+
+	if (data.byte(kManspath) != 3) {
+		data.word(kWatchingtime) = 30*2;
+		data.word(kReeltowatch) = 2;
+		data.word(kEndwatchreel) = 31;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		data.byte(kGetback) = 1;
+		turnPathOn(3);
+		turnPathOn(4);
+		turnPathOff(0);
+		turnPathOff(1);
+		turnPathOff(2);
+		turnPathOff(5);
+		data.byte(kManspath) = 3;
+		data.byte(kFinaldest) = 3;
+		findXYFromPath();
+		data.byte(kResetmanxy) = 1;
+		switchRyanOff();
+	} else {
+		// Go back over
+		data.word(kWatchingtime) = 30 * 2;
+		data.word(kReeltowatch) = 34;
+		data.word(kEndwatchreel) = 60;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		data.byte(kGetback) = 1;
+		turnPathOff(3);
+		turnPathOff(4);
+		turnPathOn(0);
+		turnPathOn(1);
+		turnPathOn(2);
+		turnPathOn(5);
+		data.byte(kManspath) = 5;
+		data.byte(kFinaldest) = 5;
+		findXYFromPath();
+		data.byte(kResetmanxy) = 1;
+		switchRyanOff();
+	}
+}
+
 } /*namespace dreamgen */
 


Commit: 8cf4ba1ed699bc6f4ab8191590b1f1dd591e8a50
    https://github.com/scummvm/scummvm/commit/8cf4ba1ed699bc6f4ab8191590b1f1dd591e8a50
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-05T18:55:59-08:00

Commit Message:
DREAMWEB: 'dosreturn' has already been converted to C++

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.h
    engines/dreamweb/stubs.h



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 1e6009b..3100c3d 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -236,6 +236,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'dolook',
 	'domix',
 	'doorway',
+	'dosreturn',
 	'doshake',
 	'drawflags',
 	'drawfloor',
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 72ef492..ca66f02 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -698,7 +698,6 @@ public:
 	void describeOb();
 	void deleteExFrame();
 	void bossMan();
-	void DOSReturn();
 	void searchForSame();
 	void chewy();
 	void getBack1();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 80c7645..74660e5 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -519,5 +519,6 @@
 	void openEden();
 	void openSarters();
 	void openLouis();
+	void DOSReturn();
 
 #endif