thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DREAMWEB: 'eden' ported to C++

Browse source
This commit is contained in:
Bertrand Augereau 2011-12-01 15:55:50 +01:00
parent 270eb8773c
commit ba12c02a75
5 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
devtools/tasmrecover/tasm-recover
View file

@ -339,6 +339,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'othersmoker', 'othersmoker',
'barwoman', 'barwoman',
'gamer', 'gamer',
'eden',
], skip_output = [ ], skip_output = [
# These functions are processed but not output # These functions are processed but not output
'dreamweb', 'dreamweb',

9
engines/dreamweb/dreamgen.cpp
View file

@ -170,15 +170,6 @@ void DreamGenContext::manasleep() {
addtopeoplelist(); addtopeoplelist();
} }
void DreamGenContext::eden() {
STACK_CHECK;
_cmp(data.byte(kGeneraldead), 0);
if (!flags.z())
return /* (notinbed) */;
showgamereel();
addtopeoplelist();
}
void DreamGenContext::edeninbath() { void DreamGenContext::edeninbath() {
STACK_CHECK; STACK_CHECK;
_cmp(data.byte(kGeneraldead), 0); _cmp(data.byte(kGeneraldead), 0);

2
engines/dreamweb/dreamgen.h
View file

@ -478,7 +478,6 @@ public:
static const uint16 addr_femalefan = 0xc028; static const uint16 addr_femalefan = 0xc028;
static const uint16 addr_malefan = 0xc024; static const uint16 addr_malefan = 0xc024;
static const uint16 addr_edeninbath = 0xc020; static const uint16 addr_edeninbath = 0xc020;
static const uint16 addr_eden = 0xc01c;
static const uint16 addr_manasleep = 0xc018; static const uint16 addr_manasleep = 0xc018;
static const uint16 addr_attendant = 0xc014; static const uint16 addr_attendant = 0xc014;
static const uint16 addr_smokebloke = 0xc010; static const uint16 addr_smokebloke = 0xc010;
@ -1173,7 +1172,6 @@ public:
void fadedownmon(); void fadedownmon();
void loadcart(); void loadcart();
void bartender(); void bartender();
void eden();
void showdiary(); void showdiary();
void outofopen(); void outofopen();
void dircom(); void dircom();

11
engines/dreamweb/sprite.cpp
View file

@ -569,7 +569,7 @@ void DreamGenContext::showrain() {
static void (DreamGenContext::*reelCallbacks[57])() = { static void (DreamGenContext::*reelCallbacks[57])() = {
NULL, NULL, NULL, NULL,
&DreamGenContext::eden, &DreamGenContext::edeninbath, NULL, &DreamGenContext::edeninbath,
&DreamGenContext::sparky, &DreamGenContext::smokebloke, &DreamGenContext::sparky, &DreamGenContext::smokebloke,
&DreamGenContext::manasleep, &DreamGenContext::drunk, &DreamGenContext::manasleep, &DreamGenContext::drunk,
&DreamGenContext::receptionist, &DreamGenContext::malefan, &DreamGenContext::receptionist, &DreamGenContext::malefan,
@ -601,7 +601,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = { static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
&DreamGenContext::gamer, &DreamGenContext::sparkydrip, &DreamGenContext::gamer, &DreamGenContext::sparkydrip,
/*&DreamGenContext::eden*/NULL, /*&DreamGenContext::edeninbath*/NULL, &DreamGenContext::eden, /*&DreamGenContext::edeninbath*/NULL,
/*&DreamGenContext::sparky*/NULL, /*&DreamGenContext::smokebloke*/NULL, /*&DreamGenContext::sparky*/NULL, /*&DreamGenContext::smokebloke*/NULL,
/*&DreamGenContext::manasleep*/NULL, /*&DreamGenContext::drunk*/NULL, /*&DreamGenContext::manasleep*/NULL, /*&DreamGenContext::drunk*/NULL,
/*&DreamGenContext::receptionist*/NULL, /*&DreamGenContext::malefan*/NULL, /*&DreamGenContext::receptionist*/NULL, /*&DreamGenContext::malefan*/NULL,
@ -1100,5 +1100,12 @@ void DreamGenContext::gamer(ReelRoutine &routine) {
addtopeoplelist(&routine); addtopeoplelist(&routine);
} }
void DreamGenContext::eden(ReelRoutine &routine) {
if (data.byte(kGeneraldead))
return;
showgamereel(&routine);
addtopeoplelist(&routine);
}
} /*namespace dreamgen */ } /*namespace dreamgen */

1
engines/dreamweb/stubs.h
View file

@ -380,4 +380,5 @@
void sparkydrip(ReelRoutine &routine); void sparkydrip(ReelRoutine &routine);
void othersmoker(ReelRoutine &routine); void othersmoker(ReelRoutine &routine);
void gamer(ReelRoutine &routine); void gamer(ReelRoutine &routine);
void eden(ReelRoutine &routine);