[Scummvm-cvs-logs] SF.net SVN: scummvm:[45114] scummvm/trunk/engines/sci/gui/gui_palette.cpp

[thebluegr at users.sourceforge.net]

Revision: 45114
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45114&view=rev
Author:   thebluegr
Date:     2009-10-15 12:04:07 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Changed palette initialization depending on the findings of the resource manager. Fixes the palette in several SCI1 EGA games

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_palette.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_palette.cpp	2009-10-15 11:57:36 UTC (rev 45113)
+++ scummvm/trunk/engines/sci/gui/gui_palette.cpp	2009-10-15 12:04:07 UTC (rev 45114)
@@ -55,14 +55,12 @@
 	_sysPalette.colors[255].b = 255;
 
 	if (autoSetPalette) {
-		// Load default palette from resource 999
-		if (!setFromResource(999, 2)) {
-			// if not found, we try to set amiga palette
-			if (!setAmiga()) {
-				// if that also doesnt work out, set EGA palette
-				setEGA();
-			}
-		};
+		if (_resMan->getViewType() == kViewEga)
+			setEGA();
+		else if (_resMan->getViewType() == kViewAmiga)
+			setAmiga();
+		else
+			setFromResource(999, 2);
 	}
 }
 


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