aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2011-08-21 22:07:17 +0200
committerJohannes Schickel2011-08-21 22:07:17 +0200
commitae19be062824c7e17632d2c4da7ba5c2f4624095 (patch)
tree88e76a10280d39a0542357f12ad6f22459977c66 /engines
parenta07908a00104386f7c2df44142630d556a97e8fe (diff)
downloadscummvm-rg350-ae19be062824c7e17632d2c4da7ba5c2f4624095.tar.gz
scummvm-rg350-ae19be062824c7e17632d2c4da7ba5c2f4624095.tar.bz2
scummvm-rg350-ae19be062824c7e17632d2c4da7ba5c2f4624095.zip
SCUMM: Actually disable the setShadowPalette used in Indy4...
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/palette.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index c7305121e5..30096000ce 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;