[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.238,1.239 scumm.cpp,1.128,1.129 scumm.h,1.441,1.442

Travis Howell kirben at users.sourceforge.net
Sat Aug 21 23:17:02 CEST 2004


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

Modified Files:
	resource.cpp scumm.cpp scumm.h 
Log Message:

Mac. version of indy3 uses VAR_VIDEOMODE value of 50
Add initial support for loading EGA resource


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- resource.cpp	14 Aug 2004 03:16:32 -0000	1.238
+++ resource.cpp	22 Aug 2004 06:16:16 -0000	1.239
@@ -2601,6 +2601,8 @@
 		return (0x5842);	// BX
 	case (MKID('CYCL')):
 		return (0x4343);	// CC
+	case (MKID('EPAL')):
+		return (0x5053);	// SP
 	default:
 		return (0);
 	}

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- scumm.cpp	21 Aug 2004 23:12:11 -0000	1.128
+++ scumm.cpp	22 Aug 2004 06:16:16 -0000	1.129
@@ -559,6 +559,7 @@
 	_ENCD_offs = 0;
 	_EXCD_offs = 0;
 	_CLUT_offs = 0;
+	_EPAL_offs = 0;
 	_IM00_offs = 0;
 	_PALS_offs = 0;
 	_fullRedraw = false;
@@ -1360,13 +1361,14 @@
 			} else
 				VAR(VAR_SOUNDCARD) = 3;
 		}
-		// Amiga version of MI2 and FM Towns versions use unique values
 		if (_features & GF_FMTOWNS)
 			VAR(VAR_VIDEOMODE) = 42;
+		else if (_gameId == GID_INDY3 && (_features & GF_MACINTOSH))
+			VAR(VAR_VIDEOMODE) = 50;
 		else if (_gameId == GID_MONKEY2 && (_features & GF_AMIGA))
 			VAR(VAR_VIDEOMODE) = 82;
 		else
-			VAR(VAR_VIDEOMODE) = 19;
+			VAR(VAR_VIDEOMODE) = 14;
 		if (_gameId == GID_LOOM && _features & GF_OLD_BUNDLE) {
 			// Set number of sound resources
 			if (!(_features & GF_MACINTOSH))
@@ -2306,6 +2308,7 @@
 
 	_ENCD_offs = 0;
 	_EXCD_offs = 0;
+	_EPAL_offs = 0;
 	_CLUT_offs = 0;
 	_PALS_offs = 0;
 
@@ -2606,6 +2609,17 @@
 	if (_features & GF_OLD_BUNDLE)
 		ptr = 0;
 	else if (_features & GF_SMALL_HEADER)
+		ptr = findResourceSmall(MKID('EPAL'), roomptr);
+	else
+		ptr = findResourceData(MKID('EPAL'), roomptr);
+
+	if (ptr) {
+		_EPAL_offs = ptr - roomptr;
+	}
+
+	if (_features & GF_OLD_BUNDLE)
+		ptr = 0; // TODO ? do 16 bit games use a palette?!?
+	else if (_features & GF_SMALL_HEADER)
 		ptr = findResourceSmall(MKID('CLUT'), roomptr);
 	else
 		ptr = findResourceData(MKID('CLUT'), roomptr);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -d -r1.441 -r1.442
--- scumm.h	14 Aug 2004 19:42:00 -0000	1.441
+++ scumm.h	22 Aug 2004 06:16:16 -0000	1.442
@@ -854,7 +854,7 @@
 	ColorCycle _colorCycle[16];	// Palette cycles
 
 	uint32 _ENCD_offs, _EXCD_offs;
-	uint32 _CLUT_offs;
+	uint32 _CLUT_offs, _EPAL_offs;
 	uint32 _IM00_offs, _PALS_offs;
 
 	StripTable *_roomStrips;





More information about the Scummvm-git-logs mailing list