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

lordhoto lordhoto at gmail.com
Sun Aug 21 22:13:03 CEST 2011


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:
ae19be0628 SCUMM: Actually disable the setShadowPalette used in Indy4...


Commit: ae19be062824c7e17632d2c4da7ba5c2f4624095
    https://github.com/scummvm/scummvm/commit/ae19be062824c7e17632d2c4da7ba5c2f4624095
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-21T13:07:17-07:00

Commit Message:
SCUMM: Actually disable the setShadowPalette used in Indy4...

Changed paths:
    engines/scumm/palette.cpp



diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index c730512..3009600 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -650,12 +650,6 @@ void ScummEngine::setShadowPalette(int slot, int redScale, int greenScale, int b
 	int i;
 	byte *curpal;
 
-	// This function is actually a nullsub in Indy4 Amiga.
-	// It might very well be a nullsub in other Amiga games, but for now I
-	// limit this to Indy4 Amiga, since that is the only game I can check.
-	if (_game.platform == Common::kPlatformAmiga && _game.id == GID_INDY4)
-		return;
-
 	if (slot < 0 || slot >= NUM_SHADOW_PALETTE)
 		error("setShadowPalette: invalid slot %d", slot);
 
@@ -682,6 +676,12 @@ static inline uint colorWeight(int red, int green, int blue) {
 }
 
 void ScummEngine::setShadowPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor, int start, int end) {
+	// This function is actually a nullsub in Indy4 Amiga.
+	// It might very well be a nullsub in other Amiga games, but for now I
+	// limit this to Indy4 Amiga, since that is the only game I can check.
+	if (_game.platform == Common::kPlatformAmiga && _game.id == GID_INDY4)
+		return;
+
 	const byte *basepal = getPalettePtr(_curPalIndex, _roomResource);
 	const byte *compareptr;
 	const byte *pal = basepal + start * 3;






More information about the Scummvm-git-logs mailing list