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

[thebluegr at users.sourceforge.net]

Revision: 51148
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51148&view=rev
Author:   thebluegr
Date:     2010-07-22 16:01:32 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
SCI: changed the comment about the palette merging (it's not a workaround anymore). Also, changed the warning when a picture has a broken palette into debug output - these pictures (which can be found in other games too) are usually meant to be blank, thus don't have a palette

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-07-22 15:56:26 UTC (rev 51147)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-07-22 16:01:32 UTC (rev 51148)
@@ -60,12 +60,12 @@
 
 	_sysPaletteChanged = false;
 
-	// Pseudo-WORKAROUND
-	// Quest for Glory 3 demo, Eco Quest 1 demo, Laura Bow 2 demo, Police Quest 1 vga and all Nick's Picks
-	// all use an inbetween interpreter, some parts are SCI1.1, some parts are SCI1
-	//  It's not using the SCI1.1 palette merging (copying over all the colors) but the real merging
-	//  If we use the copying over, we will get issues because some views have marked all colors as being used
-	//  and those will overwrite the current palette in that case
+	// Quest for Glory 3 demo, Eco Quest 1 demo, Laura Bow 2 demo, Police Quest
+	// 1 vga and all Nick's Picks all use the older palette format and thus are
+	// not using the SCI1.1 palette merging (copying over all the colors) but
+	// the real merging done in earlier games. If we use the copying over, we
+	// will get issues because some views have marked all colors as being used
+	// and those will overwrite the current palette in that case
 	_useMerging = useMerging;
 
 	palVaryInit();
@@ -106,12 +106,7 @@
 	if (bytesLeft < 37) {
 		// This happens when loading palette of picture 0 in sq5 - the resource is broken and doesn't contain a full
 		//  palette
-
-		if (g_sci->getGameId() == GID_SQ5 && g_sci->getEngineState()->currentRoomNumber() == 110 && bytesLeft == 28) {
-			// Known case for SQ5, which doesn't affect gameplay, thus don't throw a warning
-		} else {
-			warning("GfxPalette::createFromData() - not enough bytes in resource, expected palette header");
-		}
+		debugC(2, "GfxPalette::createFromData() - not enough bytes in resource (%d), expected palette header", bytesLeft);
 		return;
 	}
 	// palette formats in here are not really version exclusive, we can not use sci-version to differentiate between them


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