[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.194,1.195 scumm.cpp,1.346,1.347

kirben kirben at users.sourceforge.net
Sun Mar 6 16:54:14 CET 2005


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

Modified Files:
	saveload.cpp scumm.cpp 
Log Message:

Allow EGA option in Amiga/Atari ST games.
Restore correct palette after reloading saved game.


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- saveload.cpp	2 Mar 2005 07:11:58 -0000	1.194
+++ saveload.cpp	7 Mar 2005 00:53:30 -0000	1.195
@@ -252,10 +252,30 @@
 		else
 			setupV1ZakPalette();
 	} else if (_features & GF_16COLOR) {
-		if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))
-			setupAmigaPalette();
-		else
+		switch (_renderMode) {
+		case Common::kRenderEGA:
 			setupEGAPalette();
+			break;
+
+		case Common::kRenderAmiga:
+			setupAmigaPalette();
+			break;
+
+		case Common::kRenderCGA:
+			setupCGAPalette();
+			break;
+
+		case Common::kRenderHercA:
+		case Common::kRenderHercG:
+			setupHercPalette();
+			break;
+
+		default:
+			if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))
+				setupAmigaPalette();
+			else
+				setupEGAPalette();
+		}
 	} else
 		setDirtyColors(0, 255);
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -d -r1.346 -r1.347
--- scumm.cpp	7 Mar 2005 00:39:48 -0000	1.346
+++ scumm.cpp	7 Mar 2005 00:53:30 -0000	1.347
@@ -1323,14 +1323,31 @@
 	} else if (_features & GF_16COLOR) {
 		for (i = 0; i < 16; i++)
 			_shadowPalette[i] = i;
-		if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST) || _renderMode == Common::kRenderAmiga)
+
+		switch (_renderMode) {
+		case Common::kRenderEGA:
+			setupEGAPalette();
+			break;
+
+		case Common::kRenderAmiga:
 			setupAmigaPalette();
-		else if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG)
-			setupHercPalette();
-		else if (_renderMode == Common::kRenderCGA)
+			break;
+
+		case Common::kRenderCGA:
 			setupCGAPalette();
-		else
-			setupEGAPalette();
+			break;
+
+		case Common::kRenderHercA:
+		case Common::kRenderHercG:
+			setupHercPalette();
+			break;
+
+		default:
+			if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))
+				setupAmigaPalette();
+			else
+				setupEGAPalette();
+		}
 	}
 
 	if (_version > 3 && _version < 8)





More information about the Scummvm-git-logs mailing list