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

[lordhoto]

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:
bc6ed998a9 SCUMM: Fix for bug #3174197.


Commit: bc6ed998a9d80b60057e910cc983a5fca7c0a002
    https://github.com/scummvm/scummvm/commit/bc6ed998a9d80b60057e910cc983a5fca7c0a002
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-21T09:52:29-07:00

Commit Message:
SCUMM: Fix for bug #3174197.

The bug is: "FOA: Wrong colors in the Amiga version".

In the original Indy4 Amiga executable palManipulateInit is a nullsub, thus
the palette effect set up by the scripts is just ignored.

The same might be true for other SCUMM Amiga games, but I can not check these
thus I limited this to Indy4 Amiga for now.

Changed paths:
    engines/scumm/palette.cpp



diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 51ba219..bf5f20f 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -544,6 +544,12 @@ void ScummEngine::palManipulateInit(int resID, int start, int end, int time) {
 		return;
 #endif
 
+	// 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;
+
 	byte *string1 = getStringAddress(resID);
 	byte *string2 = getStringAddress(resID + 1);
 	byte *string3 = getStringAddress(resID + 2);