aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-07-13 15:59:11 +0000
committerMax Horn2002-07-13 15:59:11 +0000
commitdfdd2d407da4c6f564ae588dcbea443102a534d7 (patch)
treeab37ef74a2c1721d828b0f434deb7f64581d3e50
parentbbc90cace69b19586ad8bf93e8698ac1ab491aeb (diff)
downloadscummvm-rg350-dfdd2d407da4c6f564ae588dcbea443102a534d7.tar.gz
scummvm-rg350-dfdd2d407da4c6f564ae588dcbea443102a534d7.tar.bz2
scummvm-rg350-dfdd2d407da4c6f564ae588dcbea443102a534d7.zip
fixed palette bug (visible in MonkeyVGA in the forest on Melee Island); added some code that might or might not be right for o5_actorset:15
svn-id: r4538
-rw-r--r--script_v1.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/script_v1.cpp b/script_v1.cpp
index 08d062c750..b2d54d3135 100644
--- a/script_v1.cpp
+++ b/script_v1.cpp
@@ -774,6 +774,17 @@ void Scumm::o5_actorSet()
break;
case 15: /* unk */
error("o5_actorset:unk not implemented");
+#if 0
+ int16 args[16] =
+ {
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ };
+ getWordVararg(args);
+ for (i = 0; i < 16; i++)
+ if (args[i] != 0xFF)
+ a->palette[i] = args[i] /* & 0x0F */;
+#endif
break;
case 16: /* width */
a->width = getVarOrDirectByte(0x80);
@@ -1920,7 +1931,7 @@ void Scumm::o5_roomOps()
b = getVarOrDirectWord(0x40);
}
checkRange(256, 0, a, "o5_roomOps: 2: Illegal room color slot (%d)");
- _currentPalette[a] = b; /*FIXME: should be shadow palette */
+ _shadowPalette[a] = b;
// _fullRedraw = 1;
} else {
a = getVarOrDirectWord(0x80);