diff options
| author | Travis Howell | 2003-08-18 02:16:48 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-18 02:16:48 +0000 |
| commit | 4c6bd7167d3a7df2c0d1a99962dc27d7d274fffc (patch) | |
| tree | f97b2fbe1dde2fb9fde176b381561debcd34f4b6 /scumm/script_v2.cpp | |
| parent | 99c677f2a3297b16046bfeeb639a3420a046a1dc (diff) | |
| download | scummvm-rg350-4c6bd7167d3a7df2c0d1a99962dc27d7d274fffc.tar.gz scummvm-rg350-4c6bd7167d3a7df2c0d1a99962dc27d7d274fffc.tar.bz2 scummvm-rg350-4c6bd7167d3a7df2c0d1a99962dc27d7d274fffc.zip | |
Fix v1 zak costume colors
svn-id: r9748
Diffstat (limited to 'scumm/script_v2.cpp')
| -rw-r--r-- | scumm/script_v2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 973b7f7281..70876372c2 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -372,7 +372,7 @@ int Scumm_v2::getVar() { return readVar(fetchScriptByte()); } -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}; +int v1_mm_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]; @@ -417,7 +417,7 @@ void Scumm_v2::decodeParseString() { // V1 Mansion Mansion uses static color table for subtitles if (((_gameId == GID_MANIAC) && (_version == 1)) && _actorToPrintStrFor != 0xFF) - _string[textSlot].color = actor_speech_color[_actorToPrintStrFor]; + _string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor]; _messagePtr = buffer; switch (textSlot) { @@ -710,7 +710,7 @@ void Scumm_v2::o2_actorSet() { case 5: // Talk Color if ((_gameId == GID_MANIAC) && (_version == 1)) - actor_speech_color[act] = arg; + v1_mm_actor_speech_color[act] = arg; else a->talkColor = arg; break; |