[Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.11,2.12 scumm.cpp,1.104,1.105

Travis Howell kirben at users.sourceforge.net
Sun Jul 25 22:41:04 CEST 2004


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

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

Fix darkness issues in Amiga verisons of FOA/MI2.



Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -d -r2.11 -r2.12
--- palette.cpp	25 Jul 2004 14:48:07 -0000	2.11
+++ palette.cpp	26 Jul 2004 05:40:23 -0000	2.12
@@ -541,10 +541,6 @@
 
 		palptr = getPalettePtr(_curPalIndex);
 		for (j = startColor; j <= endColor; j++) {
-			// FIXME: Hack to fix Amiga palette adjustments
-			if ((_features & GF_AMIGA && _version == 5) && (j >= 16 && j < 81))
-				continue;
-
 			idx = (_heversion == 70) ? _HEV7ActorPalette[j] : j;
 			cptr = palptr + idx * 3;
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- scumm.cpp	24 Jul 2004 11:15:59 -0000	1.104
+++ scumm.cpp	26 Jul 2004 05:40:23 -0000	1.105
@@ -1329,7 +1329,9 @@
 			} else
 				VAR(VAR_SOUNDCARD) = 3;
 		}
-		VAR(VAR_VIDEOMODE) = 0x13;
+		// Amiga versions of FOA and MI2 are only 32 colors.
+		if (!(_version == 5 && _features & GF_AMIGA))
+			VAR(VAR_VIDEOMODE) = 19;
 		if (_gameId == GID_LOOM && _features & GF_OLD_BUNDLE) {
 			// Set number of sound resources
 			if (!(_features & GF_MACINTOSH))





More information about the Scummvm-git-logs mailing list