[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.272,2.273

[Torbj?rn Andersson]

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

Modified Files:
	scummvm.cpp 
Log Message:
Update the 16-colour palette if the user changes the Amiga setting from
the options dialog.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.272
retrieving revision 2.273
diff -u -d -r2.272 -r2.273
--- scummvm.cpp	11 Jul 2003 10:13:42 -0000	2.272
+++ scummvm.cpp	11 Jul 2003 14:54:16 -0000	2.273
@@ -753,6 +753,8 @@
 void Scumm::setFeatures (uint32 newFeatures) {
 	bool newCostumes = (_features & GF_NEW_COSTUMES) != 0;
 	bool newNewCostumes = (newFeatures & GF_NEW_COSTUMES) != 0;
+	bool amigaPalette = (_features & GF_AMIGA) != 0;
+	bool newAmigaPalette = (newFeatures & GF_AMIGA) != 0;
 
 	_features = newFeatures;
 	
@@ -763,6 +765,13 @@
 		else
 			_costumeRenderer = new CostumeRenderer(this);
 	}
+
+	if ((_features & GF_16COLOR) && amigaPalette != newAmigaPalette) {
+		if (_features & GF_AMIGA)
+			setupAmigaPalette();
+		else
+			setupEGAPalette();
+	}
 }
 
 void Scumm::scummInit() {
@@ -784,15 +793,12 @@
 			_shadowPalette[i] = i;
 		setupC64Palette();
 	} else if (_features & GF_16COLOR) {
-		if (_features & GF_AMIGA) {
-			for (i = 0; i < 16; i++)
-				_shadowPalette[i] = i;
+		for (i = 0; i < 16; i++)
+			_shadowPalette[i] = i;
+		if (_features & GF_AMIGA)
 			setupAmigaPalette();
-		} else {
-			for (i = 0; i < 16; i++)
-				_shadowPalette[i] = i;
+		else
 			setupEGAPalette();
-		}
 	}
 
 	if (_version <= 2) {