diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 9 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 2 | ||||
| -rw-r--r-- | engines/dreamweb/sprite.cpp | 11 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 |
5 files changed, 11 insertions, 13 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index bdb58a572b..e36c3df6cb 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -339,6 +339,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'othersmoker', 'barwoman', 'gamer', + 'eden', ], skip_output = [ # These functions are processed but not output 'dreamweb', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 260e6d5edd..cfdfcd47a4 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -170,15 +170,6 @@ void DreamGenContext::manasleep() { addtopeoplelist(); } -void DreamGenContext::eden() { - STACK_CHECK; - _cmp(data.byte(kGeneraldead), 0); - if (!flags.z()) - return /* (notinbed) */; - showgamereel(); - addtopeoplelist(); -} - void DreamGenContext::edeninbath() { STACK_CHECK; _cmp(data.byte(kGeneraldead), 0); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index a5fba4de30..d6d2a16709 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -478,7 +478,6 @@ public: static const uint16 addr_femalefan = 0xc028; static const uint16 addr_malefan = 0xc024; static const uint16 addr_edeninbath = 0xc020; - static const uint16 addr_eden = 0xc01c; static const uint16 addr_manasleep = 0xc018; static const uint16 addr_attendant = 0xc014; static const uint16 addr_smokebloke = 0xc010; @@ -1173,7 +1172,6 @@ public: void fadedownmon(); void loadcart(); void bartender(); - void eden(); void showdiary(); void outofopen(); void dircom(); diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index f8c865da6c..a9f5bf1815 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -569,7 +569,7 @@ void DreamGenContext::showrain() { static void (DreamGenContext::*reelCallbacks[57])() = { NULL, NULL, - &DreamGenContext::eden, &DreamGenContext::edeninbath, + NULL, &DreamGenContext::edeninbath, &DreamGenContext::sparky, &DreamGenContext::smokebloke, &DreamGenContext::manasleep, &DreamGenContext::drunk, &DreamGenContext::receptionist, &DreamGenContext::malefan, @@ -601,7 +601,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = { static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = { &DreamGenContext::gamer, &DreamGenContext::sparkydrip, - /*&DreamGenContext::eden*/NULL, /*&DreamGenContext::edeninbath*/NULL, + &DreamGenContext::eden, /*&DreamGenContext::edeninbath*/NULL, /*&DreamGenContext::sparky*/NULL, /*&DreamGenContext::smokebloke*/NULL, /*&DreamGenContext::manasleep*/NULL, /*&DreamGenContext::drunk*/NULL, /*&DreamGenContext::receptionist*/NULL, /*&DreamGenContext::malefan*/NULL, @@ -1100,5 +1100,12 @@ void DreamGenContext::gamer(ReelRoutine &routine) { addtopeoplelist(&routine); } +void DreamGenContext::eden(ReelRoutine &routine) { + if (data.byte(kGeneraldead)) + return; + showgamereel(&routine); + addtopeoplelist(&routine); +} + } /*namespace dreamgen */ diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index b1f2b8a693..68349dbfad 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -380,4 +380,5 @@ void sparkydrip(ReelRoutine &routine); void othersmoker(ReelRoutine &routine); void gamer(ReelRoutine &routine); + void eden(ReelRoutine &routine); |