[Scummvm-cvs-logs] SF.net SVN: scummvm:[47525] scummvm/trunk/engines/sci/graphics/palette.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 47525
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47525&view=rev
Author:   m_kiewitz
Date:     2010-01-24 21:11:26 +0000 (Sun, 24 Jan 2010)

Log Message:
-----------
SCI: never set palette for amiga games (fixes kq5 palette corruption at the beginning)

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 21:01:21 UTC (rev 47524)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-01-24 21:11:26 UTC (rev 47525)
@@ -151,7 +151,8 @@
 			_sysPalette.colors[curColor].b = (byte2 & 0x0F) * 0x11;
 		}
 		file.close();
-		setOnScreen();
+		// Directly set the palette, because setOnScreen() wont do a thing for amiga
+		_screen->setPalette(&_sysPalette);
 
 		// Create EGA to amiga table
 		for (curColor = 1; curColor < 16; curColor++) {
@@ -294,6 +295,9 @@
 void SciPalette::setOnScreen() {
 //	if (pal != &_sysPalette)
 //		memcpy(&_sysPalette,pal,sizeof(Palette));
+	// We dont change palette at all times for amiga
+	if (_resMan->getViewType() == kViewAmiga)
+		return;
 	_screen->setPalette(&_sysPalette);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.