[Scummvm-cvs-logs] scummvm master -> 44ed4ef0dfef85d5505109b46a4ce7d0f9bb60d5

[wjp]

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:
44ed4ef0df DREAMWEB: Move 'train' out of dreamgen again


Commit: 44ed4ef0dfef85d5505109b46a4ce7d0f9bb60d5
    https://github.com/scummvm/scummvm/commit/44ed4ef0dfef85d5505109b46a4ce7d0f9bb60d5
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-06T12:19:42-08:00

Commit Message:
DREAMWEB: Move 'train' out of dreamgen again

Apparently it is effectively empty...

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index e65f5f6..ce45a91 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -585,6 +585,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'textforend',
 	'textformonk',
 	'titles',
+	'train',
 	'transferinv',
 	'transfertext',
 	'trapdoor',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c66d6b7..33f1939 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1200,32 +1200,6 @@ nocopper:
 	addToPeopleList();
 }
 
-void DreamGenContext::train() {
-	STACK_CHECK;
-	return;
-	ax = es.word(bx+3);
-	_cmp(ax, 21);
-	if (!flags.c())
-		goto notrainyet;
-	_inc(ax);
-	goto gottrainframe;
-notrainyet:
-	randomNumber();
-	_cmp(al, 253);
-	if (flags.c())
-		return /* (notrainatall) */;
-	_cmp(data.byte(kManspath), 5);
-	if (!flags.z())
-		return /* (notrainatall) */;
-	_cmp(data.byte(kFinaldest), 5);
-	if (!flags.z())
-		return /* (notrainatall) */;
-	ax = 5;
-gottrainframe:
-	es.word(bx+3) = ax;
-	showGameReel();
-}
-
 void DreamGenContext::checkForExit() {
 	STACK_CHECK;
 	cl = data.byte(kRyanx);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 37435fa..a24c631 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -577,7 +577,6 @@ public:
 	void adjustUp();
 	void fadeScreenDownHalf();
 	void mouseCall();
-	void train();
 	void fadeDownMon();
 	void bartender();
 	void showDiary();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 1fa5d13..8b83b60 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -41,7 +41,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	&DreamGenContext::smallCandle, NULL,
 	&DreamGenContext::copper, &DreamGenContext::poolGuard,
 	NULL, &DreamGenContext::businessMan,
-	&DreamGenContext::train, NULL,
+	NULL, NULL,
 	&DreamGenContext::mugger, &DreamGenContext::helicopter,
 	NULL, NULL,
 	&DreamGenContext::introMagic2, &DreamGenContext::candles2,
@@ -73,7 +73,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	/*&DreamGenContext::smallcandle*/NULL, &DreamGenContext::security,
 	/*&DreamGenContext::copper*/NULL, /*&DreamGenContext::poolGuard*/NULL,
 	&DreamGenContext::rockstar, /*&DreamGenContext::businessMan*/NULL,
-	/*&DreamGenContext::train*/NULL, &DreamGenContext::genericPerson /*aide*/,
+	&DreamGenContext::train, &DreamGenContext::genericPerson /*aide*/,
 	/*&DreamGenContext::mugger*/NULL, /*&DreamGenContext::helicopter*/NULL,
 	&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
 	/*&DreamGenContext::introMagic2*/NULL, /*&DreamGenContext::candles2*/NULL,
@@ -461,5 +461,8 @@ void DreamGenContext::foghornSound(ReelRoutine &routine) {
 		playChannel1(13);
 }
 
+void DreamGenContext::train(ReelRoutine &routine) {
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 7d92176..4724ae2 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -450,6 +450,7 @@
 	void handClap(ReelRoutine &routine);
 	void carParkDrip(ReelRoutine &routine);
 	void foghornSound(ReelRoutine &routine);
+	void train(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	void loadKeypad();