[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.151,1.152 script_v2.cpp,2.169,2.170

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8087/scumm

Modified Files:
	actor.cpp script_v2.cpp 
Log Message:

Fix subtitles colors in V1 maniac


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- actor.cpp	12 Aug 2003 16:43:43 -0000	1.151
+++ actor.cpp	16 Aug 2003 05:45:19 -0000	1.152
@@ -1157,7 +1157,8 @@
 			return;
 	}
 
-	if (VAR(VAR_TALK_ACTOR) > 0x7F) {
+	//FIXME looks like V1 Maniac Mansion needs a different type of check at this point.
+	if (((_gameId == GID_MANIAC) && (_version == 1)) || VAR(VAR_TALK_ACTOR) > 0x7F) {
 		_charsetColor = (byte)_string[0].color;
 	} else {
 		a = derefActor(VAR(VAR_TALK_ACTOR), "actorTalk(2)");

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.169
retrieving revision 2.170
diff -u -d -r2.169 -r2.170
--- script_v2.cpp	14 Aug 2003 11:40:50 -0000	2.169
+++ script_v2.cpp	16 Aug 2003 05:45:19 -0000	2.170
@@ -372,6 +372,8 @@
 	return readVar(fetchScriptByte());
 }
 
+int static 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 Scumm_v2::decodeParseString() {
 	byte buffer[256];
 	byte *ptr = buffer;
@@ -412,7 +414,10 @@
 	_string[textSlot].right = 320;
 	_string[textSlot].center = false;
 	_string[textSlot].overhead = false;
-//	_string[textSlot].color = 9;	// light blue
+
+	// V1 Mansion Mansion uses static color table for subtitles
+	if (((_gameId == GID_MANIAC) && (_version == 1)) && _actorToPrintStrFor != 0xFF) 
+		_string[textSlot].color =  actor_speech_color[_actorToPrintStrFor];
 
 	_messagePtr = buffer;
 	switch (textSlot) {