From a53d6ebcf09842466e88465fde22383deb55a5b9 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sun, 26 Sep 2004 06:50:08 +0000 Subject: [PATCH] _shadowPalette should be cleared for SCUMM 7 games too. svn-id: r15283 --- scumm/scumm.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index a6072481268..2d1e0b0fd95 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1782,7 +1782,12 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { _actors[i].hideActor(); } - if (_version < 7) { + if (_version >= 7) { + // Set the shadow palette(s) to all black. This fixes + // bug #795940, and actually makes some sense (after all, + // shadows tend to be rather black, don't they? ;-) + memset(_shadowPalette, 0, NUM_SHADOW_PALETTE * 256); + } else { for (i = 0; i < 256; i++) { _roomPalette[i] = i; if (_shadowPalette) @@ -1790,11 +1795,6 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { } if (_features & GF_SMALL_HEADER) setDirtyColors(0, 255); - } else if (_version == 8) { - // Set the shadow palette(s) to all black. This fixes - // bug #795940, and actually makes some sense (after all, - // shadows tend to be rather black, don't they? ;-) - memset(_shadowPalette, 0, NUM_SHADOW_PALETTE * 256); } clearDrawObjectQueue();