[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.640,1.641

[kirben]

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

Modified Files:
	scumm.cpp 
Log Message:

More changes for bundled Macintosh versions.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.640
retrieving revision 1.641
diff -u -d -r1.640 -r1.641
--- scumm.cpp	17 Nov 2005 13:20:09 -0000	1.640
+++ scumm.cpp	18 Nov 2005 00:59:10 -0000	1.641
@@ -715,7 +715,7 @@
 	{ "dig.la0", "The Dig Demo Data", kGenAsIs },
 	{ "dig", "digdemo", kGenPC },
 	{ "ft.la0", "Full Throttle Data", kGenAsIs },
-	{ "ft.la0", "Full Throttle Demo Data", kGenAsIs },
+	{ "ftdemo.la0", "Full Throttle Demo Data", kGenAsIs },
 	{ "ft.la0", "Vollgas Data", kGenAsIs },
 	{ "ft.la0", "Vollgas Demo Data", kGenAsIs },
 	{ "ft.la0", "ft.000", kGenAsIs },
@@ -973,14 +973,15 @@
 	} else
 		_fileHandle = new ScummFile();
 
-	// The mac versions of Sam&Max, DOTT, FT and The Dig used a special meta
-	// (container) file format to store the actual SCUMM data files. The
-	// rescumm utility used to be used to extract those files. While that is
-	// still possible, we now support reading those files directly.
-	// The first step is to check whether one of them is present (we do that
-	// here); the rest is handled by the  ScummFile class and code in
-	// openResourceFile() (and in the Sound class, for MONSTER.SOU handling).
-	if (_version >= 6 && _heversion == 0 && _substResFileNameIndex &&
+	// The mac versions of Indy4, Sam&Max, DOTT, FT and The Dig used a
+	// special meta (container) file format to store the actual SCUMM data
+	// files. The rescumm utility used to be used to extract those files. 
+	// While that is still possible, we now support reading those files 
+	// directly. The first step is to check whether one of them is present
+	// (we do that here); the rest is handled by the  ScummFile class and 
+	// code in openResourceFile() (and in the Sound class, for MONSTER.SOU
+	// handling).
+	if (_version >= 5 && _heversion == 0 && _substResFileNameIndex &&
 		_platform == Common::kPlatformMacintosh && 
 		substResFileNameTable[_substResFileNameIndex].genMethod == kGenAsIs) {
 		if (_fileHandle->open(substResFileNameTable[_substResFileNameIndex].macName)) {