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

[thebluegr at users.sourceforge.net]

Revision: 51131
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51131&view=rev
Author:   thebluegr
Date:     2010-07-22 08:57:25 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
Silenced a known warning in SQ5, after the intro

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 01:44:45 UTC (rev 51130)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-07-22 08:57:25 UTC (rev 51131)
@@ -106,7 +106,12 @@
 	if (bytesLeft < 37) {
 		// This happens when loading palette of picture 0 in sq5 - the resource is broken and doesn't contain a full
 		//  palette
-		warning("GfxPalette::createFromData() - not enough bytes in resource, expected palette header");
+
+		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");
+		}
 		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.