DREAMWEB: Move 'train' out of dreamgen again

Apparently it is effectively empty...
This commit is contained in:
Willem Jan Palenstijn 2011-12-06 21:18:17 +01:00
parent 454205a6e3
commit 44ed4ef0df
5 changed files with 7 additions and 29 deletions

View File

@ -585,6 +585,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'textforend',
'textformonk',
'titles',
'train',
'transferinv',
'transfertext',
'trapdoor',

View File

@ -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);

View File

@ -577,7 +577,6 @@ public:
void adjustUp();
void fadeScreenDownHalf();
void mouseCall();
void train();
void fadeDownMon();
void bartender();
void showDiary();

View File

@ -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 */

View File

@ -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();