aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-07-14 18:20:20 +0000
committerMax Horn2003-07-14 18:20:20 +0000
commit5031b62871f1b9ae8bc28ca199bb6fddae0d4dd7 (patch)
tree3f240f6dacc5adb062faddc6166ec5b012f182e8
parent1c9a8569186a78a9031e13f99f57cfc7d79b921c (diff)
downloadscummvm-rg350-5031b62871f1b9ae8bc28ca199bb6fddae0d4dd7.tar.gz
scummvm-rg350-5031b62871f1b9ae8bc28ca199bb6fddae0d4dd7.tar.bz2
scummvm-rg350-5031b62871f1b9ae8bc28ca199bb6fddae0d4dd7.zip
proper fix for V1/Zak (and maybe V1/MM, too?) ActorSet-Color
svn-id: r9018
-rw-r--r--scumm/script_v2.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 9592a97274..447bfc0af0 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -686,15 +686,15 @@ void Scumm_v2::o2_actorSet() {
break;
case 2: // Actor Set Color
- i = fetchScriptByte();
- a->palette[i] = arg;
- a->needRedraw = true;
-
- // FIXME: Hack for V1 Zak
if ((_gameId == GID_ZAK) && (_version == 1)) {
- fetchScriptByte();
- fetchScriptByte();
+ // FIXME: maybe this is needed for MM v1, too, but so far I have
+ // not seen any call to this in it at all, so I don't know
+ i = 3;
+ } else {
+ i = fetchScriptByte();
}
+ a->palette[i] = arg;
+ a->needRedraw = true;
break;
case 3: // Actor Name