aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2003-08-16 10:37:26 +0000
committerTravis Howell2003-08-16 10:37:26 +0000
commit8cd96c7926f7ef764a22b65c4d6eb9d599e82f31 (patch)
treecbd7acfcccf79d9af49edcb9996b23db6fc4bab1 /scumm
parent806ff4acb3755df6cc01a7bb700fdf88fec9cd93 (diff)
downloadscummvm-rg350-8cd96c7926f7ef764a22b65c4d6eb9d599e82f31.tar.gz
scummvm-rg350-8cd96c7926f7ef764a22b65c4d6eb9d599e82f31.tar.bz2
scummvm-rg350-8cd96c7926f7ef764a22b65c4d6eb9d599e82f31.zip
color table for actor subtitles in v1 maniac isn't static after all, fixes color issue in demo mode.
svn-id: r9722
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v2.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 7730171ad9..8bbe9f60ae 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -372,7 +372,7 @@ int Scumm_v2::getVar() {
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};
+int 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[512];
@@ -709,7 +709,10 @@ void Scumm_v2::o2_actorSet() {
break;
case 5: // Talk Color
- a->talkColor = arg;
+ if ((_gameId == GID_MANIAC) && (_version == 1))
+ actor_speech_color[act] = arg;
+ else
+ a->talkColor = arg;
break;
default:
warning("o2_actorSet: opcode %d not yet supported", _opcode);