[Scummvm-cvs-logs] scummvm master -> a643981a385b20ef71a4d1987965f5d1b73fdadc

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a643981a38 SCI: Handle resource ID -1 when setting the palVary resource


Commit: a643981a385b20ef71a4d1987965f5d1b73fdadc
    https://github.com/scummvm/scummvm/commit/a643981a385b20ef71a4d1987965f5d1b73fdadc
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-06-08T01:57:43-07:00

Commit Message:
SCI: Handle resource ID -1 when setting the palVary resource

Fixes several wrong colors in SQ6

Changed paths:
    engines/sci/graphics/palette.cpp



diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 47d1647..ea154c5 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -698,7 +698,7 @@ void GfxPalette::palVaryInit() {
 }
 
 bool GfxPalette::palVaryLoadTargetPalette(GuiResourceId resourceId) {
-	_palVaryResourceId = resourceId;
+	_palVaryResourceId = (resourceId != 65535) ? resourceId : -1;
 	Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), false);
 	if (palResource) {
 		// Load and initialize destination palette