DREAMWEB: 'manasleep2' ported to C++ (same as 'manasleep')

scummvm · Dec 7, 2011 · 3962bcb · 3962bcb
1 parent b419f73
commit 3962bcb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git 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
@@ -136,15 +136,6 @@ void DreamGenContext::louisChair() {
 	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
@@ -639,7 +639,6 @@ class DreamGenContext : public Context {
 	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
@@ -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,