diff options
| author | Travis Howell | 2005-11-20 08:29:17 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-11-20 08:29:17 +0000 |
| commit | 832c9a1b490abd8d1ec374d5c8519ad57085287e (patch) | |
| tree | 46a5a21f426158fc80ab1b305dd3570f87c9c108 /scumm/saveload.cpp | |
| parent | e4736ad0b8bd8feeee6b101788af2459074d3d38 (diff) | |
| download | scummvm-rg350-832c9a1b490abd8d1ec374d5c8519ad57085287e.tar.gz scummvm-rg350-832c9a1b490abd8d1ec374d5c8519ad57085287e.tar.bz2 scummvm-rg350-832c9a1b490abd8d1ec374d5c8519ad57085287e.zip | |
Update Commodore 64 palette table.
Cleanup.
svn-id: r19673
Diffstat (limited to 'scumm/saveload.cpp')
| -rw-r--r-- | scumm/saveload.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index aab059cc36..34f423c9ce 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -320,16 +320,12 @@ bool ScummEngine::loadState(int slot, bool compat) { // for backwards compatibility, and it may still prove useful if we // ever add options for using different 16-colour palettes. if (_version == 1) { - if (_platform == Common::kPlatformC64) + if (_platform == Common::kPlatformC64) { setupC64Palette(); - else { - if (_gameId == GID_MANIAC) - if (_platform == Common::kPlatformNES) - setupNESPalette(); - else - setupV1ManiacPalette(); - else - setupV1ZakPalette(); + } else if (_platform == Common::kPlatformNES) { + setupNESPalette(); + } else { + setupV1Palette(); } } else if (_features & GF_16COLOR) { switch (_renderMode) { |