aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2005-05-18 00:46:30 +0000
committerEugene Sandulenko2005-05-18 00:46:30 +0000
commitcba94db699bb834bfa9b05472843c5825dec9d72 (patch)
treed1fa5abbf28b47990af2555fb37e3950e126280e /scumm/scumm.cpp
parent0ef8642bb535dc25bf7732a6f87951c4f9253049 (diff)
downloadscummvm-rg350-cba94db699bb834bfa9b05472843c5825dec9d72.tar.gz
scummvm-rg350-cba94db699bb834bfa9b05472843c5825dec9d72.tar.bz2
scummvm-rg350-cba94db699bb834bfa9b05472843c5825dec9d72.zip
Add C64 palette.
Fix Zak C64. Now it is playable. svn-id: r18148
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 9147c7ba96..f298790e0d 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1568,13 +1568,17 @@ void ScummEngine::scummInit() {
// line
// Original games used some kind of dynamic
// color table remapping between rooms
- if (_gameId == GID_MANIAC) {
- if (_platform == Common::kPlatformNES)
- setupNESPalette();
- else
- setupV1ManiacPalette();
- } else
- setupV1ZakPalette();
+ if (_platform == Common::kPlatformC64)
+ setupC64Palette();
+ else {
+ if (_gameId == GID_MANIAC) {
+ if (_platform == Common::kPlatformNES)
+ setupNESPalette();
+ else
+ setupV1ManiacPalette();
+ } else
+ setupV1ZakPalette();
+ }
} else if (_features & GF_16COLOR) {
for (i = 0; i < 16; i++)
_shadowPalette[i] = i;