Cleanup

svn-id: r14336

4 files changed, 11 insertions, 14 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 890bef63d9..c0df1c4903 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1212,7 +1212,7 @@ void ScummEngine::actorTalk(const byte *msg) {
 			return;
 	}
 
-	if (((_gameId == GID_MANIAC) && (_version == 1)) || getTalkingActor() > 0x7F) {
+	if (getTalkingActor() > 0x7F) {
 		_charsetColor = (byte)_string[0].color;
 	} else {
 		a = derefActor(getTalkingActor(), "actorTalk(2)");
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index ef265042b9..d51909a7fb 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -342,10 +342,10 @@ void CostumeRenderer::c64_ignorePakCols(int num) {
 	}
 }
 
-static const int v1_mm_actor_palatte_1[25] = {
+static const int v1MMActorPalatte1[25] = {
 	8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8
 };
-static const int v1_mm_actor_palatte_2[25] = {
+static const int v1MMActorPalatte2[25] = {
 	0, 7, 2, 6, 9, 1, 3, 7, 7, 1, 1, 9, 1, 4, 5, 5, 4, 1, 0, 5, 4, 2, 2, 7, 7
 };
 
@@ -384,8 +384,8 @@ void CostumeRenderer::procC64(int actor) {
 		palette[2] = 11;
 		palette[3] = 11;
 	} else if (_vm->_gameId == GID_MANIAC) {
-		palette[1] = v1_mm_actor_palatte_1[actor];
-		palette[2] = v1_mm_actor_palatte_2[actor];
+		palette[1] = v1MMActorPalatte1[actor];
+		palette[2] = v1MMActorPalatte2[actor];
 	} else {
 		palette[1] = 8;
 		palette[2] = _palette[actor];
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 30de09802c..16e7753f21 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -379,8 +379,6 @@ int ScummEngine_v2::getVar() {
 	return readVar(fetchScriptByte());
 }
 
-int v1_mm_actor_speech_color[] = {1, 7, 2, 14, 8, 1, 3, 7, 7, 12, 1, 13, 1, 4, 5, 5, 4, 3, 1, 5, 1, 1, 1, 7, 7, 0};
-
 void ScummEngine_v2::decodeParseString() {
 	byte buffer[512];
 	byte *ptr = buffer;
@@ -423,9 +421,6 @@ void ScummEngine_v2::decodeParseString() {
 		// Demos don't set subtitle color before display first subtitle.
 		if (_demoMode && _actorToPrintStrFor == 0xFF)
 			_string[textSlot].color = (_version == 2) ? 15 : 1;
-		// V1 Mansion Mansion uses dynamic color table for subtitles
-		else if (_version == 1 && _actorToPrintStrFor != 0xFF) 
-			_string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor];
 	}
 
 	actorTalk(buffer);
@@ -709,9 +704,7 @@ void ScummEngine_v2::o2_actorOps() {
 		a->setActorCostume(arg);
 		break;
 	case 5:		// SO_TALK_COLOR
-		if ((_gameId == GID_MANIAC) && (_version == 1))
-			v1_mm_actor_speech_color[act] = arg;
-		else if (_gameId == GID_MANIAC && _demoMode && arg == 1)
+		if (_gameId == GID_MANIAC && _version == 2 && _demoMode && arg == 1)
 			a->talkColor = 15;
 		else
 			a->talkColor = arg;
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 3b0a70134c..5e445f1b58 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1101,6 +1101,8 @@ void ScummEngine::launch() {
 	}
 }
 
+int v1MMActorTalkColor[] = {1, 7, 2, 14, 8, 1, 3, 7, 7, 12, 1, 13, 1, 4, 5, 5, 4, 3, 1, 5, 1, 1, 1, 7, 7, 0};
+
 void ScummEngine::scummInit() {
 	int i;
 
@@ -1162,8 +1164,10 @@ void ScummEngine::scummInit() {
 		_actors[i].initActor(1);
 	
 		// this is from IDB
-		if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode))
+		if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode)) {
 			_actors[i].setActorCostume(i);
+			_actors[i].talkColor = v1MMActorTalkColor[i];
+		}
 	}
 
 	// HACK Some palette changes needed for demo script