[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.524,1.525

Eugene Sandulenko sev at users.sourceforge.net
Fri May 20 17:29:44 CEST 2005


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

Modified Files:
	scumm.cpp 
Log Message:
Fix samnmax-alt target. Actually now it is obsolete.
Game with samnimax.sm0 always detected as 'samnmax' because there is no
MD5 difference and thus made detected target unrunnable.

Now both for .000 and .sm0 target 'samnmax' is properly detected and used.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -d -r1.524 -r1.525
--- scumm.cpp	20 May 2005 22:49:09 -0000	1.524
+++ scumm.cpp	21 May 2005 00:27:41 -0000	1.525
@@ -175,8 +175,9 @@
 
 	{"samnmax", "Sam & Max", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
 	 GF_USE_KEY, Common::kPlatformPC, 0, 0},
+	// This target is obsolete now. Kept here only for compatibility
 	{"samnmax-alt", "Sam & Max (alt)", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
-	 GF_USE_KEY, Common::kPlatformPC, "samnmax", "samnmax.sm0"},
+	 GF_USE_KEY, Common::kPlatformPC, "samnmax", "samnmax.000"},
 	{"samnmaxMac", "Sam & Max (Mac)", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
 	 GF_USE_KEY, Common::kPlatformMacintosh, "samnmax", "Sam & Max Data"},
 	{"samdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
@@ -646,6 +647,7 @@
 	{ "racedemo", "500demo", kGenPC},
 	{ "racedemo", "RaceDemo", kGenMac },
 	{ "samnmax", "ramnmax", kGenPC }, // Used in some releases of Russian Sam'n'Max
+	{ "samnmax.000", "samnmax.sm0", kGenAsIs }, // Fixes MD5 detection
 	{ "SamsFunShop", "Sam's FunShop", kGenMac },
 	{ "sf2-demo", "Spy Fox 2 - Demo", kGenMac },
 	{ "sf2-demo", "sf2demo", kGenPC },





More information about the Scummvm-git-logs mailing list