[Scummvm-cvs-logs] SF.net SVN: scummvm:[47521] scummvm/trunk/engines/sci/graphics/palette.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Sun Jan 24 21:38:56 CET 2010
Revision: 47521
http://scummvm.svn.sourceforge.net/scummvm/?rev=47521&view=rev
Author: m_kiewitz
Date: 2010-01-24 20:38:56 +0000 (Sun, 24 Jan 2010)
Log Message:
-----------
SCI: fixing amiga mapping for colors 0 and 15, those are hardcoded like everywhere else
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/palette.cpp
Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp 2010-01-24 20:31:01 UTC (rev 47520)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp 2010-01-24 20:38:56 UTC (rev 47521)
@@ -53,6 +53,8 @@
_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 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list