From 5feaf410c82a4ff0fa24b908075f6559c2e8715b Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 3 Mar 2004 03:14:22 +0000
Subject: That should have been maniac specific.

svn-id: r13163
---
 scumm/script_v2.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'scumm')

diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 8537f5c08a..df4277dec4 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -419,13 +419,14 @@ void ScummEngine_v2::decodeParseString() {
 	_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();
-- 
cgit v1.2.3