aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/palette.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2011-08-21 18:50:12 +0200
committerJohannes Schickel2011-08-21 18:52:29 +0200
commitbc6ed998a9d80b60057e910cc983a5fca7c0a002 (patch)
treec6f704fc6b1a51b3096e4cedd8b966ea31868773 /engines/scumm/palette.cpp
parent36dafb3c1f8b0a971c4021b14a820a896cbb8921 (diff)
downloadscummvm-rg350-bc6ed998a9d80b60057e910cc983a5fca7c0a002.tar.gz
scummvm-rg350-bc6ed998a9d80b60057e910cc983a5fca7c0a002.tar.bz2
scummvm-rg350-bc6ed998a9d80b60057e910cc983a5fca7c0a002.zip
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.
Diffstat (limited to 'engines/scumm/palette.cpp')
-rw-r--r--engines/scumm/palette.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 51ba2195d7..bf5f20f1bd 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);