libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 18:27:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DREAMWEB: 'aide', 'mansatstill' and 'tattooman' changed into genericPerson

Browse Source
This commit is contained in:
Filippos Karapetis 2011-12-05 22:11:01 +02:00
parent b94b4e631b
commit 20356203be
4 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devtools/tasmrecover/tasm-recover
View File

@ -147,6 +147,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'addtopeoplelist',
'addtopresslist',
'adjustlen',
'aide',
'allocatebuffers',
'allocateload',
'allocatework',
@ -352,6 +353,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'makeworn',
'malefan',
'manasleep',
'mansatstill',
'maptopanel',
'modifychar',
'monmessage',
@ -496,6 +498,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'storeit',
'switchryanoff',
'switchryanon',
'tattooman',
'textforend',
'textformonk',
'titles',

18
engines/dreamweb/dreamgen.cpp
View File

@ -180,18 +180,6 @@ void DreamGenContext::manAsleep2() {
addToPeopleList();
}
void DreamGenContext::manSatStill() {
STACK_CHECK;
showGameReel();
addToPeopleList();
}
void DreamGenContext::tattooMan() {
STACK_CHECK;
showGameReel();
addToPeopleList();
}
void DreamGenContext::drinker() {
STACK_CHECK;
checkSpeed();
@ -450,12 +438,6 @@ endmugger1:
es = pop();
}
void DreamGenContext::aide() {
STACK_CHECK;
showGameReel();
addToPeopleList();
}
void DreamGenContext::businessMan() {
STACK_CHECK;
data.byte(kPointermode) = 0;

3
engines/dreamweb/dreamgen.h
View File

@ -707,7 +707,6 @@ public:
void useDryer();
void outOfInv();
void diaryKeyP();
void manSatStill();
void transferMap();
void showMonk();
void diaryKeyN();
@ -831,7 +830,6 @@ public:
void useCardReader1();
void useCardReader2();
void useCardReader3();
void tattooMan();
void useHandle();
void openFile();
void showPuzText();
@ -866,7 +864,6 @@ public:
void makeMainScreen();
void useWinch();
void setBotRight();
void aide();
void updateSymbolTop();
void allPointer();
void checkSoundInt();

12
engines/dreamweb/people.cpp
View File

@ -34,14 +34,14 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
&DreamGenContext::louisChair, &DreamGenContext::soldier1,
&DreamGenContext::bossMan, &DreamGenContext::interviewer,
&DreamGenContext::heavy, &DreamGenContext::manAsleep2,
&DreamGenContext::manSatStill, &DreamGenContext::drinker,
NULL, &DreamGenContext::drinker,
&DreamGenContext::bartender, NULL,
&DreamGenContext::tattooMan, &DreamGenContext::attendant,
NULL, &DreamGenContext::attendant,
&DreamGenContext::keeper, &DreamGenContext::candles1,
&DreamGenContext::smallCandle, NULL,
&DreamGenContext::copper, &DreamGenContext::poolGuard,
NULL, &DreamGenContext::businessMan,
&DreamGenContext::train, &DreamGenContext::aide,
&DreamGenContext::train, NULL,
&DreamGenContext::mugger, &DreamGenContext::helicopter,
&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
&DreamGenContext::introMagic2, &DreamGenContext::candles2,
@ -66,14 +66,14 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
/*&DreamGenContext::louisChair*/NULL, /*&DreamGenContext::soldier1*/NULL,
/*&DreamGenContext::bossMan*/NULL, /*&DreamGenContext::interviewer*/NULL,
/*&DreamGenContext::heavy*/NULL, /*&DreamGenContext::manAsleep2*/NULL,
/*&DreamGenContext::manSatStill*/NULL, /*&DreamGenContext::drinker*/NULL,
&DreamGenContext::genericPerson /*manSatStill*/, /*&DreamGenContext::drinker*/NULL,
/*&DreamGenContext::bartender*/NULL, &DreamGenContext::genericPerson /*otherSmoker*/,
/*&DreamGenContext::tattooMan*/NULL, /*&DreamGenContext::attendant*/NULL,
&DreamGenContext::genericPerson /*tattooMan*/, /*&DreamGenContext::attendant*/NULL,
/*&DreamGenContext::keeper*/NULL, /*&DreamGenContext::candles1*/NULL,
/*&DreamGenContext::smallcandle*/NULL, &DreamGenContext::security,
/*&DreamGenContext::copper*/NULL, /*&DreamGenContext::poolGuard*/NULL,
&DreamGenContext::rockstar, /*&DreamGenContext::businessMan*/NULL,
/*&DreamGenContext::train*/NULL, /*&DreamGenContext::aide*/NULL,
/*&DreamGenContext::train*/NULL, &DreamGenContext::genericPerson /*aide*/,
/*&DreamGenContext::mugger*/NULL, /*&DreamGenContext::helicopter*/NULL,
/*&DreamGenContext::introMagic1*/NULL, /*&DreamGenContext::introMusic*/NULL,
/*&DreamGenContext::introMagic2*/NULL, /*&DreamGenContext::candles2*/NULL,