[Scummvm-cvs-logs] scummvm master -> 20356203be2d4083e3c4d764cd247fa996d60c3e

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
20356203be DREAMWEB: 'aide', 'mansatstill' and 'tattooman' changed into genericPerson


Commit: 20356203be2d4083e3c4d764cd247fa996d60c3e
    https://github.com/scummvm/scummvm/commit/20356203be2d4083e3c4d764cd247fa996d60c3e
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-05T12:11:39-08:00

Commit Message:
DREAMWEB: 'aide', 'mansatstill' and 'tattooman' changed into genericPerson

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/people.cpp



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 91d43a4..83ba403 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -147,6 +147,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'addtopeoplelist',
 	'addtopresslist',
 	'adjustlen',
+	'aide',
 	'allocatebuffers',
 	'allocateload',
 	'allocatework',
@@ -352,6 +353,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'makeworn',
 	'malefan',
 	'manasleep',
+	'mansatstill',
 	'maptopanel',
 	'modifychar',
 	'monmessage',
@@ -496,6 +498,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'storeit',
 	'switchryanoff',
 	'switchryanon',
+	'tattooman',
 	'textforend',
 	'textformonk',
 	'titles',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 1758fd0..c8eeca2 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -180,18 +180,6 @@ void DreamGenContext::manAsleep2() {
 	addToPeopleList();
 }
 
-void DreamGenContext::manSatStill() {
-	STACK_CHECK;
-	showGameReel();
-	addToPeopleList();
-}
-
-void DreamGenContext::tattooMan() {
-	STACK_CHECK;
-	showGameReel();
-	addToPeopleList();
-}
-
 void DreamGenContext::drinker() {
 	STACK_CHECK;
 	checkSpeed();
@@ -450,12 +438,6 @@ endmugger1:
 	es = pop();
 }
 
-void DreamGenContext::aide() {
-	STACK_CHECK;
-	showGameReel();
-	addToPeopleList();
-}
-
 void DreamGenContext::businessMan() {
 	STACK_CHECK;
 	data.byte(kPointermode) = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 2c6bb10..3033fda 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -707,7 +707,6 @@ public:
 	void useDryer();
 	void outOfInv();
 	void diaryKeyP();
-	void manSatStill();
 	void transferMap();
 	void showMonk();
 	void diaryKeyN();
@@ -831,7 +830,6 @@ public:
 	void useCardReader1();
 	void useCardReader2();
 	void useCardReader3();
-	void tattooMan();
 	void useHandle();
 	void openFile();
 	void showPuzText();
@@ -866,7 +864,6 @@ public:
 	void makeMainScreen();
 	void useWinch();
 	void setBotRight();
-	void aide();
 	void updateSymbolTop();
 	void allPointer();
 	void checkSoundInt();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index ebf1adf..ef44338 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -34,14 +34,14 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	&DreamGenContext::louisChair, &DreamGenContext::soldier1,
 	&DreamGenContext::bossMan, &DreamGenContext::interviewer,
 	&DreamGenContext::heavy, &DreamGenContext::manAsleep2,
-	&DreamGenContext::manSatStill, &DreamGenContext::drinker,
+	NULL, &DreamGenContext::drinker,
 	&DreamGenContext::bartender, NULL,
-	&DreamGenContext::tattooMan, &DreamGenContext::attendant,
+	NULL, &DreamGenContext::attendant,
 	&DreamGenContext::keeper, &DreamGenContext::candles1,
 	&DreamGenContext::smallCandle, NULL,
 	&DreamGenContext::copper, &DreamGenContext::poolGuard,
 	NULL, &DreamGenContext::businessMan,
-	&DreamGenContext::train, &DreamGenContext::aide,
+	&DreamGenContext::train, NULL,
 	&DreamGenContext::mugger, &DreamGenContext::helicopter,
 	&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
 	&DreamGenContext::introMagic2, &DreamGenContext::candles2,
@@ -66,14 +66,14 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	/*&DreamGenContext::louisChair*/NULL, /*&DreamGenContext::soldier1*/NULL,
 	/*&DreamGenContext::bossMan*/NULL, /*&DreamGenContext::interviewer*/NULL,
 	/*&DreamGenContext::heavy*/NULL, /*&DreamGenContext::manAsleep2*/NULL,
-	/*&DreamGenContext::manSatStill*/NULL, /*&DreamGenContext::drinker*/NULL,
+	&DreamGenContext::genericPerson /*manSatStill*/, /*&DreamGenContext::drinker*/NULL,
 	/*&DreamGenContext::bartender*/NULL, &DreamGenContext::genericPerson /*otherSmoker*/,
-	/*&DreamGenContext::tattooMan*/NULL, /*&DreamGenContext::attendant*/NULL,
+	&DreamGenContext::genericPerson /*tattooMan*/, /*&DreamGenContext::attendant*/NULL,
 	/*&DreamGenContext::keeper*/NULL, /*&DreamGenContext::candles1*/NULL,
 	/*&DreamGenContext::smallcandle*/NULL, &DreamGenContext::security,
 	/*&DreamGenContext::copper*/NULL, /*&DreamGenContext::poolGuard*/NULL,
 	&DreamGenContext::rockstar, /*&DreamGenContext::businessMan*/NULL,
-	/*&DreamGenContext::train*/NULL, /*&DreamGenContext::aide*/NULL,
+	/*&DreamGenContext::train*/NULL, &DreamGenContext::genericPerson /*aide*/,
 	/*&DreamGenContext::mugger*/NULL, /*&DreamGenContext::helicopter*/NULL,
 	/*&DreamGenContext::introMagic1*/NULL, /*&DreamGenContext::introMusic*/NULL,
 	/*&DreamGenContext::introMagic2*/NULL, /*&DreamGenContext::candles2*/NULL,