libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-07 10:48:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DREAMWEB: Ported 'drunk' to C++

Browse Source
This commit is contained in:
Bertrand Augereau 2011-12-04 15:44:03 +01:00
parent 112921a19f
commit 6df11b314d
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devtools/tasmrecover/tasm-recover
View File

@ -196,6 +196,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'doshake', 'doshake',
'drawflags', 'drawflags',
'drawfloor', 'drawfloor',
'drunk',
'dumpblink', 'dumpblink',
'dumpeverything', 'dumpeverything',
'dumpmap', 'dumpmap',

12
engines/dreamweb/dreamgen.cpp
View File

@ -1527,18 +1527,6 @@ void DreamGenContext::priestText() {
setupTimedUse(); setupTimedUse();
} }
void DreamGenContext::drunk() {
STACK_CHECK;
_cmp(data.byte(kGeneraldead), 0);
if (!flags.z())
return /* (trampgone) */;
al = es.byte(bx+7);
_and(al, 127);
es.byte(bx+7) = al;
showGameReel();
addToPeopleList();
}
void DreamGenContext::advisor() { void DreamGenContext::advisor() {
STACK_CHECK; STACK_CHECK;
checkSpeed(); checkSpeed();

1
engines/dreamweb/dreamgen.h
View File

@ -850,7 +850,6 @@ public:
void findPathOfPoint(); void findPathOfPoint();
void isSetObOnMap(); void isSetObOnMap();
void getDestInfo(); void getDestInfo();
void drunk();
void setupTimedUse(); void setupTimedUse();
void grafittiDoor(); void grafittiDoor();
void nextDest(); void nextDest();

14
engines/dreamweb/people.cpp
View File

@ -28,7 +28,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
NULL, NULL, NULL, NULL,
NULL, &DreamGenContext::edenInBath, NULL, &DreamGenContext::edenInBath,
NULL, NULL, NULL, NULL,
NULL, &DreamGenContext::drunk, NULL, NULL,
&DreamGenContext::receptionist, NULL, &DreamGenContext::receptionist, NULL,
NULL, &DreamGenContext::louis, NULL, &DreamGenContext::louis,
&DreamGenContext::louisChair, &DreamGenContext::soldier1, &DreamGenContext::louisChair, &DreamGenContext::soldier1,
@ -60,7 +60,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
&DreamGenContext::gamer, &DreamGenContext::sparkyDrip, &DreamGenContext::gamer, &DreamGenContext::sparkyDrip,
&DreamGenContext::eden, /*&DreamGenContext::edenInBath*/NULL, &DreamGenContext::eden, /*&DreamGenContext::edenInBath*/NULL,
&DreamGenContext::sparky, &DreamGenContext::smokeBloke, &DreamGenContext::sparky, &DreamGenContext::smokeBloke,
&DreamGenContext::manAsleep, /*&DreamGenContext::drunk*/NULL, &DreamGenContext::manAsleep, &DreamGenContext::drunk,
/*&DreamGenContext::receptionist*/NULL, &DreamGenContext::maleFan, /*&DreamGenContext::receptionist*/NULL, &DreamGenContext::maleFan,
&DreamGenContext::femaleFan, /*&DreamGenContext::louis*/NULL, &DreamGenContext::femaleFan, /*&DreamGenContext::louis*/NULL,
/*&DreamGenContext::louisChair*/NULL, /*&DreamGenContext::soldier1*/NULL, /*&DreamGenContext::louisChair*/NULL, /*&DreamGenContext::soldier1*/NULL,
@ -354,5 +354,15 @@ void DreamGenContext::manAsleep(ReelRoutine &routine) {
addToPeopleList(&routine); addToPeopleList(&routine);
} }
void DreamGenContext::drunk(ReelRoutine &routine) {
_cmp(data.byte(kGeneraldead), 0);
if (data.byte(kGeneraldead))
return;
routine.b7 &= 127;
showGameReel(&routine);
addToPeopleList(&routine);
}
} /*namespace dreamgen */ } /*namespace dreamgen */

1
engines/dreamweb/stubs.h
View File

@ -399,6 +399,7 @@
void madmansTelly(ReelRoutine &routine); void madmansTelly(ReelRoutine &routine);
void smokeBloke(ReelRoutine &routine); void smokeBloke(ReelRoutine &routine);
void manAsleep(ReelRoutine &routine); void manAsleep(ReelRoutine &routine);
void drunk(ReelRoutine &routine);
void singleKey(uint8 key, uint16 x, uint16 y); void singleKey(uint8 key, uint16 x, uint16 y);
void showKeypad(); void showKeypad();
void showOuterPad(); void showOuterPad();