[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.229,1.230

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18697/scumm

Modified Files:
	scumm.cpp 
Log Message:

_shadowPalette should be cleared for SCUMM 7 games too.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- scumm.cpp	24 Sep 2004 21:18:07 -0000	1.229
+++ scumm.cpp	26 Sep 2004 06:50:08 -0000	1.230
@@ -1782,7 +1782,12 @@
 		_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 @@
 		}
 		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();