[Scummvm-cvs-logs] scummvm master -> 0769059f984058d7bf5f1c77f05bd426844f0048

[digitall]

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

Summary:
0769059f98 DREAMWEB: 'titles' ported to C++


Commit: 0769059f984058d7bf5f1c77f05bd426844f0048
    https://github.com/scummvm/scummvm/commit/0769059f984058d7bf5f1c77f05bd426844f0048
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-04T06:52:44-08:00

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

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index ab6390f..a687e75 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -459,6 +459,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'switchryanon',
 	'textforend',
 	'textformonk',
+	'titles',
 	'transferinv',
 	'transfertext',
 	'trysoundalloc',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 26142a2..172e822 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2315,16 +2315,6 @@ void DreamGenContext::initialMonCols() {
 	showGroup();
 }
 
-void DreamGenContext::titles() {
-	STACK_CHECK;
-	clearPalette();
-	bibleQuote();
-	_cmp(data.byte(kQuitrequested),  0);
-	if (!flags.z())
-		return /* (titlesearly) */;
-	intro();
-}
-
 void DreamGenContext::endGame() {
 	STACK_CHECK;
 	dx = 1146;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 9dbb041..a080410 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -580,7 +580,6 @@ public:
 	void openSarters();
 	void putUnderCentre();
 	void checkObjectSize();
-	void titles();
 	void deallocateMem();
 	void showGroup();
 	void watchReel();
@@ -601,7 +600,6 @@ public:
 	void introMonks1();
 	void resetLocation();
 	void introMonks2();
-	void advisor();
 	void additionalText();
 	void useElevator5();
 	void useElevator4();
@@ -685,7 +683,7 @@ public:
 	void lockLightOff();
 	void wearWatch();
 	void runIntroSeq();
-	void nextColon();
+	void advisor();
 	void attendant();
 	void nextSymbol();
 	void monks2text();
@@ -695,6 +693,7 @@ public:
 	void openHotelDoor();
 	void blank();
 	void drinker();
+	void nextColon();
 	void placeFreeObject();
 	void allPalette();
 	void adjustRight();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index b50710c..939b358 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -542,7 +542,12 @@ void DreamGenContext::dreamweb() {
 		if (startNewGame) {
 			// "playGame"
 
-			titles();
+			// "titles"
+			clearPalette();
+			bibleQuote();
+			if (!quitRequested()) // "titlesearly"
+				intro();
+
 			if (quitRequested())
 				goto done;