[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.327,1.328 scumm.cpp,1.546,1.547

[Eugene Sandulenko]

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

Modified Files:
	resource.cpp scumm.cpp 
Log Message:
Fix C64 targets. Regression.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- resource.cpp	23 May 2005 03:44:10 -0000	1.327
+++ resource.cpp	19 Jun 2005 18:16:16 -0000	1.328
@@ -139,7 +139,7 @@
 		}
 
 		// If we have substitute
-		if (_substResFileNameIndex > 0 && !(_platform == Common::kPlatformNES)) {
+		if (_substResFileNameIndex > 0 && !(_platform == Common::kPlatformNES || _platform == Common::kPlatformC64)) {
 			char tmpBuf[128];
 
 			generateSubstResFileName(buf, tmpBuf, sizeof(tmpBuf));
@@ -230,7 +230,7 @@
 		file.close();
 		file.open(_containerFile.c_str());
 		assert(file.isOpen());
-		
+
 		result = file.openSubFile(filename);
 	}
 	

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -d -r1.546 -r1.547
--- scumm.cpp	18 Jun 2005 15:44:40 -0000	1.546
+++ scumm.cpp	19 Jun 2005 18:16:27 -0000	1.547
@@ -583,10 +583,10 @@
 	{ "00.LFL", "Maniac Mansion (F).prg", kGenAsIs },
 	{ "00.LFL", "Maniac Mansion (SW).prg", kGenAsIs },
 	{ "00.LFL", "Maniac Mansion (U).prg", kGenAsIs },
-	{ "00.LFL", "maniac1.d64", kGenAsIs },
-	{ "00.LFL", "zak1.d64", kGenAsIs },
-	{ "01.LFL", "maniac2.d64", kGenAsIs },
-	{ "01.LFL", "zak2.d64", kGenAsIs },
+	{ "00.LFL", "maniac1.d64", kGenAsIs }, // Do not
+	{ "01.LFL", "maniac2.d64", kGenAsIs }, // swap
+	{ "00.LFL", "zak1.d64", kGenAsIs },    // these
+	{ "01.LFL", "zak2.d64", kGenAsIs },    // lines
 	{ "airdemo", "Airport Demo", kGenMac},
 	{ "balloon", "Balloon-O-Rama", kGenMac},
 	{ "baseball", "BaseBall", kGenMac},
@@ -1600,9 +1600,9 @@
 		_imuse->setBase(res.address[rtSound]);
 	}
 
-	// Since MM NES substitutes whole file class we get monster.sou file
+	// Since MM NES and C64 targets substitute whole file class we get monster.sou file
 	// name badly generated, so avoid even attempts to open it
-	if (!(_platform == Common::kPlatformNES))
+	if (!((_platform == Common::kPlatformNES) || (_platform == Common::kPlatformC64)))
 		_sound->setupSound();
 
 	// Create debugger