aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-24 20:38:56 +0000
committerMartin Kiewitz2010-01-24 20:38:56 +0000
commit029154ab3ae1ba1954b3f3dc2962265f1878690a (patch)
tree87cb85b85612b6c31b4801a679d897645df19ea9
parentb4ecf7f0e1f4fef6048d2d31e32b56376ca8d328 (diff)
downloadscummvm-rg350-029154ab3ae1ba1954b3f3dc2962265f1878690a.tar.gz
scummvm-rg350-029154ab3ae1ba1954b3f3dc2962265f1878690a.tar.bz2
scummvm-rg350-029154ab3ae1ba1954b3f3dc2962265f1878690a.zip
SCI: fixing amiga mapping for colors 0 and 15, those are hardcoded like everywhere else
svn-id: r47521
-rw-r--r--engines/sci/graphics/palette.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 5aafdd2d09..f60892fb70 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -53,6 +53,8 @@ SciPalette::SciPalette(ResourceManager *resMan, Screen *screen, bool autoSetPale
_sysPalette.colors[255].g = 255;
_sysPalette.colors[255].b = 255;
+ memset(&_amigaEGAtable, 0, sizeof(_amigaEGAtable));
+
if (autoSetPalette) {
if (_resMan->getViewType() == kViewEga)
setEGA();
@@ -152,9 +154,10 @@ bool SciPalette::setAmiga() {
setOnScreen();
// Create EGA to amiga table
- for (curColor = 0; curColor < 16; curColor++) {
+ for (curColor = 1; curColor < 15; curColor++) {
_amigaEGAtable[curColor] = matchColor(&_sysPalette, EGApalette[curColor][0], EGApalette[curColor][1], EGApalette[curColor][2]);
}
+ _amigaEGAtable[15] = _screen->getColorWhite();
return true;
}
return false;