aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-12-06 21:18:17 +0100
committerWillem Jan Palenstijn2011-12-06 21:19:42 +0100
commit44ed4ef0dfef85d5505109b46a4ce7d0f9bb60d5 (patch)
tree58b446e2698c2c3aaf4dacae2c059ae906e4d70a /engines
parent454205a6e375c00a1fd0e79aed99655fdfed9d57 (diff)
downloadscummvm-rg350-44ed4ef0dfef85d5505109b46a4ce7d0f9bb60d5.tar.gz
scummvm-rg350-44ed4ef0dfef85d5505109b46a4ce7d0f9bb60d5.tar.bz2
scummvm-rg350-44ed4ef0dfef85d5505109b46a4ce7d0f9bb60d5.zip
DREAMWEB: Move 'train' out of dreamgen again
Apparently it is effectively empty...
Diffstat (limited to 'engines')
-rw-r--r--engines/dreamweb/dreamgen.cpp26
-rw-r--r--engines/dreamweb/dreamgen.h1
-rw-r--r--engines/dreamweb/people.cpp7
-rw-r--r--engines/dreamweb/stubs.h1
4 files changed, 6 insertions, 29 deletions
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c66d6b73ff..33f1939d6e 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 37435fa6b8..a24c63163c 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 1fa5d13fda..8b83b60609 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 7d921766cf..4724ae2f81 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();