[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.237,2.238

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10694/scumm

Modified Files:
	script_v2.cpp 
Log Message:

That should have been maniac specific.


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.237
retrieving revision 2.238
diff -u -d -r2.237 -r2.238
--- script_v2.cpp	3 Mar 2004 02:53:12 -0000	2.237
+++ script_v2.cpp	3 Mar 2004 03:14:22 -0000	2.238
@@ -419,13 +419,14 @@
 	_string[textSlot].center = false;
 	_string[textSlot].overhead = false;
 
-	// Demo mode doesn'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 ((_gameId == GID_MANIAC) && (_version == 1) && (_actorToPrintStrFor != 0xFF)) 
-		_string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor];
-
+	if (_gameId == GID_MANIAC) {
+		// 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];
+	}
 
 	_messagePtr = buffer;
 	actorTalk();