diff options
| author | Filippos Karapetis | 2011-12-07 10:24:31 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2011-12-07 10:41:30 +0200 |
| commit | 3962bcb2d62b954306c0492703ebdb9dceaa87bd (patch) | |
| tree | b66e74859f030428fca24d78e9a314094035ff2d | |
| parent | b419f739734b5f63cd4b6cf241b0a36a4fb6c7be (diff) | |
| download | scummvm-rg350-3962bcb2d62b954306c0492703ebdb9dceaa87bd.tar.gz scummvm-rg350-3962bcb2d62b954306c0492703ebdb9dceaa87bd.tar.bz2 scummvm-rg350-3962bcb2d62b954306c0492703ebdb9dceaa87bd.zip | |
DREAMWEB: 'manasleep2' ported to C++ (same as 'manasleep')
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 9 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/people.cpp | 4 |
4 files changed, 3 insertions, 12 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 95f9974750..5b56602471 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -405,6 +405,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'makeworn', 'malefan', 'manasleep', + 'manasleep2', 'mansatstill', 'maptopanel', 'mode640x480', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 9ee1685629..8b755d60e7 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -136,15 +136,6 @@ notlouisanim: addToPeopleList(); } -void DreamGenContext::manAsleep2() { - STACK_CHECK; - al = es.byte(bx+7); - _and(al, 127); - es.byte(bx+7) = al; - showGameReel(); - addToPeopleList(); -} - void DreamGenContext::drinker() { STACK_CHECK; checkSpeed(); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 0c3bf809cd..f9170021ce 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -639,7 +639,6 @@ public: void selectSlot(); void fadeUpMon(); void soundEnd(); - void manAsleep2(); void introMagic2(); void introMagic3(); void showDiaryPage(); diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp index ed04a549d2..fcb257cfad 100644 --- a/engines/dreamweb/people.cpp +++ b/engines/dreamweb/people.cpp @@ -33,7 +33,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = { NULL, NULL, &DreamGenContext::louisChair, &DreamGenContext::soldier1, &DreamGenContext::bossMan, &DreamGenContext::interviewer, - &DreamGenContext::heavy, &DreamGenContext::manAsleep2, + &DreamGenContext::heavy, NULL, NULL, &DreamGenContext::drinker, &DreamGenContext::bartender, NULL, NULL, &DreamGenContext::attendant, @@ -65,7 +65,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = { &DreamGenContext::genericPerson /*femaleFan*/, &DreamGenContext::louis, /*&DreamGenContext::louisChair*/NULL, /*&DreamGenContext::soldier1*/NULL, /*&DreamGenContext::bossMan*/NULL, /*&DreamGenContext::interviewer*/NULL, - /*&DreamGenContext::heavy*/NULL, /*&DreamGenContext::manAsleep2*/NULL, + /*&DreamGenContext::heavy*/NULL, &DreamGenContext::manAsleep /*manAsleep2*/, &DreamGenContext::genericPerson /*manSatStill*/, /*&DreamGenContext::drinker*/NULL, /*&DreamGenContext::bartender*/NULL, &DreamGenContext::genericPerson /*otherSmoker*/, &DreamGenContext::genericPerson /*tattooMan*/, /*&DreamGenContext::attendant*/NULL, |