aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-09-26 06:50:08 +0000
committerTravis Howell2004-09-26 06:50:08 +0000
commita53d6ebcf09842466e88465fde22383deb55a5b9 (patch)
tree3c5c69034f5493d2ee4c73bd3d61ecbfa8a50a9e /scumm/scumm.cpp
parent4e24375caef88d6d7d7b33d57a51175fd1adfd1d (diff)
downloadscummvm-rg350-a53d6ebcf09842466e88465fde22383deb55a5b9.tar.gz
scummvm-rg350-a53d6ebcf09842466e88465fde22383deb55a5b9.tar.bz2
scummvm-rg350-a53d6ebcf09842466e88465fde22383deb55a5b9.zip
_shadowPalette should be cleared for SCUMM 7 games too.
svn-id: r15283
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index a607248126..2d1e0b0fd9 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();