[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.440,2.441

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv30934

Modified Files:
	scummvm.cpp 
Log Message:
sufficient to set _roomPalette at the start for V6+ games, since they don't modify the _roomPalette, ever

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.440
retrieving revision 2.441
diff -u -d -r2.440 -r2.441
--- scummvm.cpp	13 Oct 2003 11:38:41 -0000	2.440
+++ scummvm.cpp	13 Oct 2003 12:17:26 -0000	2.441
@@ -927,18 +927,16 @@
 		initScreens(0, 16, _screenWidth, 144);
 	}
 
+	for (i = 0; i < 256; i++)
+		_roomPalette[i] = i;
 	if (_version == 1) {
-		for (i = 0; i < 16; i++)
-			_roomPalette[i] = i;
 		if (_gameId == GID_MANIAC)
 			setupV1ManiacPalette();
 		else
 			setupV1ZakPalette();
 	} else if (_features & GF_16COLOR) {
-		for (i = 0; i < 16; i++) {
-			_roomPalette[i] = i;
+		for (i = 0; i < 16; i++)
 			_shadowPalette[i] = i;
-		}
 		if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))
 			setupAmigaPalette();
 		else
@@ -1890,13 +1888,14 @@
 		_actors[i].hideActor();
 	}
 
-	for (i = 0; i < 256; i++) {
-		_roomPalette[i] = i;
-		if (_version < 7)
+	if (_version < 7) {
+		for (i = 0; i < 256; i++) {
+			_roomPalette[i] = i;
 			_shadowPalette[i] = i;
+		}
+		if (_features & GF_SMALL_HEADER)
+			setDirtyColors(0, 255);
 	}
-	if (_features & GF_SMALL_HEADER)
-		setDirtyColors(0, 255);
 
 	clearDrawObjectQueue();