diff options
| author | Travis Howell | 2004-03-03 02:53:12 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-03-03 02:53:12 +0000 |
| commit | 84cb720df54a726af04c3804c719aad2cb8b3624 (patch) | |
| tree | aaa0ac13fc858c9f9e074e39d1049f1de7ec5b5d | |
| parent | a79a0647d762ef2b731c02074f2f3f7e106d9057 (diff) | |
| download | scummvm-rg350-84cb720df54a726af04c3804c719aad2cb8b3624.tar.gz scummvm-rg350-84cb720df54a726af04c3804c719aad2cb8b3624.tar.bz2 scummvm-rg350-84cb720df54a726af04c3804c719aad2cb8b3624.zip | |
Adjustments for Enchanced Maniac Mansion demo.
svn-id: r13161
| -rw-r--r-- | scumm/script_v2.cpp | 13 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index e621d7ca9f..8537f5c08a 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -419,14 +419,13 @@ 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 - if ((_gameId == GID_MANIAC) && (_version == 1)) { - // Demo mode doesn't set subtitle color before display first subtitle. - if (_demoMode && _actorToPrintStrFor == 0xFF) - _string[textSlot].color = 1; - else if (_actorToPrintStrFor != 0xFF) - _string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor]; - } + else if ((_gameId == GID_MANIAC) && (_version == 1) && (_actorToPrintStrFor != 0xFF)) + _string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor]; + _messagePtr = buffer; actorTalk(); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 45aed53b4e..e3b81bc3a6 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1041,7 +1041,7 @@ void ScummEngine::scummInit() { _actors[i].initActor(1); // this is from IDB - if ((_version == 1) || (_version == 2 && _demoMode)) + if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode)) _actors[i].setActorCostume(i); } |