diff options
| author | Travis Howell | 2003-07-11 10:13:42 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-07-11 10:13:42 +0000 |
| commit | 88c2ef94d2ce7569ebb5c85092602391703ea6d8 (patch) | |
| tree | d22c02b39e5b673e344607091a4060f5cd8a46a7 /scumm | |
| parent | 4c6e10bfd6d65a7c8e83d9417fb114b1263e7558 (diff) | |
| download | scummvm-rg350-88c2ef94d2ce7569ebb5c85092602391703ea6d8.tar.gz scummvm-rg350-88c2ef94d2ce7569ebb5c85092602391703ea6d8.tar.bz2 scummvm-rg350-88c2ef94d2ce7569ebb5c85092602391703ea6d8.zip | |
Using Amiga palette with 16 color Amiga versions only
svn-id: r8905
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 366dd63348..9179dd86ab 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -783,14 +783,16 @@ void Scumm::scummInit() { for (i = 0; i < 16; i++) _shadowPalette[i] = i; setupC64Palette(); - } else if (_features & GF_AMIGA) { - for (i = 0; i < 16; i++) - _shadowPalette[i] = i; - setupAmigaPalette(); } else if (_features & GF_16COLOR) { - for (i = 0; i < 16; i++) - _shadowPalette[i] = i; - setupEGAPalette(); + if (_features & GF_AMIGA) { + for (i = 0; i < 16; i++) + _shadowPalette[i] = i; + setupAmigaPalette(); + } else { + for (i = 0; i < 16; i++) + _shadowPalette[i] = i; + setupEGAPalette(); + } } if (_version <= 2) { |