aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-07-26 15:14:10 +0000
committerTravis Howell2004-07-26 15:14:10 +0000
commitf28adf7a6c57e16f97d97bd1e919eaaf591d09a4 (patch)
tree13b33e9c1d28d6513a6c2547c3c4ed61707f4a7b /scumm/scumm.cpp
parentc460aae163fce421c0d3427e7b31e5a88e1e5686 (diff)
downloadscummvm-rg350-f28adf7a6c57e16f97d97bd1e919eaaf591d09a4.tar.gz
scummvm-rg350-f28adf7a6c57e16f97d97bd1e919eaaf591d09a4.tar.bz2
scummvm-rg350-f28adf7a6c57e16f97d97bd1e919eaaf591d09a4.zip
Keep compatbility with older saved games.
svn-id: r14339
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 5e445f1b58..c43ca59122 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1101,8 +1101,6 @@ void ScummEngine::launch() {
}
}
-int v1MMActorTalkColor[] = {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 ScummEngine::scummInit() {
int i;
@@ -1166,13 +1164,14 @@ void ScummEngine::scummInit() {
// this is from IDB
if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode)) {
_actors[i].setActorCostume(i);
- _actors[i].talkColor = v1MMActorTalkColor[i];
}
}
- // HACK Some palette changes needed for demo script
- // in Maniac Mansion (Enchanced)
- if (_gameId == GID_MANIAC && _version == 2 && _demoMode) {
+ if (_gameId == GID_MANIAC && _version == 1) {
+ setupV1ActorTalkColor();
+ } else if (_gameId == GID_MANIAC && _version == 2 && _demoMode) {
+ // HACK Some palette changes needed for demo script
+ // in Maniac Mansion (Enchanced)
_actors[3].setPalette(3, 1);
_actors[9].talkColor = 15;
_actors[10].talkColor = 7;