aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-03-03 03:14:22 +0000
committerTravis Howell2004-03-03 03:14:22 +0000
commit5feaf410c82a4ff0fa24b908075f6559c2e8715b (patch)
tree248171ce02ea06d83bbb88454e874ca7f595edba /scumm
parent84cb720df54a726af04c3804c719aad2cb8b3624 (diff)
downloadscummvm-rg350-5feaf410c82a4ff0fa24b908075f6559c2e8715b.tar.gz
scummvm-rg350-5feaf410c82a4ff0fa24b908075f6559c2e8715b.tar.bz2
scummvm-rg350-5feaf410c82a4ff0fa24b908075f6559c2e8715b.zip
That should have been maniac specific.
svn-id: r13163
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v2.cpp15
1 files changed, 8 insertions, 7 deletions
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();