aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-24 12:24:23 +0000
committerEugene Sandulenko2010-08-24 12:24:23 +0000
commit066174ad75c513bef640a28b56eedc1c1c0d8473 (patch)
tree1a880d426845c26da9629f303cc7789a7e5a3b42 /engines/scumm
parent9e04bc7643bc2cbcf7e2decedd60ca89a732b053 (diff)
downloadscummvm-rg350-066174ad75c513bef640a28b56eedc1c1c0d8473.tar.gz
scummvm-rg350-066174ad75c513bef640a28b56eedc1c1c0d8473.tar.bz2
scummvm-rg350-066174ad75c513bef640a28b56eedc1c1c0d8473.zip
SCUMM: Change palette for C64 games.
Based on bugreport #2847001: "SCUMM v0: Wrong palette colors". Old palette is #ifdef'ed for reference. svn-id: r52330
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/palette.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 09da1b47c4..7659e5fe1a 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -56,11 +56,17 @@ uint16 ScummEngine::get16BitColor(uint8 r, uint8 g, uint8 b) {
void ScummEngine::resetPalette() {
static const byte tableC64Palette[] = {
+#if 1 // VICE-based palette. See bug #2847001
+ 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x7E, 0x35, 0x2B, 0x6E, 0xB7, 0xC1,
+ 0x7F, 0x3B, 0xA6, 0x5C, 0xA0, 0x35, 0x33, 0x27, 0x99, 0xCB, 0xD7, 0x65,
+ 0x85, 0x53, 0x1C, 0x50, 0x3C, 0x00, 0xB4, 0x6B, 0x61, 0x4A, 0x4A, 0x4A,
+ 0x75, 0x75, 0x75, 0xA3, 0xE7, 0x7C, 0x70, 0x64, 0xD6, 0xA3, 0xA3, 0xA3,
+#else
0x00, 0x00, 0x00, 0xFD, 0xFE, 0xFC, 0xBE, 0x1A, 0x24, 0x30, 0xE6, 0xC6,
0xB4, 0x1A, 0xE2, 0x1F, 0xD2, 0x1E, 0x21, 0x1B, 0xAE, 0xDF, 0xF6, 0x0A,
0xB8, 0x41, 0x04, 0x6A, 0x33, 0x04, 0xFE, 0x4A, 0x57, 0x42, 0x45, 0x40,
0x70, 0x74, 0x6F, 0x59, 0xFE, 0x59, 0x5F, 0x53, 0xFE, 0xA4, 0xA7, 0xA2,
-
+#endif
// Use 17 color table for v1 games to allow correct color for inventory and
// sentence line. Original games used some kind of dynamic color table
// remapping between rooms.