[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.371,1.372

Eugene Sandulenko sev at users.sourceforge.net
Fri Mar 18 07:12:10 CET 2005


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

Modified Files:
	scumm.cpp 
Log Message:
Some Russian Sam'n'Max releases have files renamed to RAMNMAX. So support
those. Also made file name substitution a general thing so we can
eventually get rid of monkey1 target et al.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -d -r1.371 -r1.372
--- scumm.cpp	18 Mar 2005 15:04:11 -0000	1.371
+++ scumm.cpp	18 Mar 2005 15:10:16 -0000	1.372
@@ -545,6 +545,7 @@
 	{ "putttime", "PuttPuttTTT", kGenPC },
 	{ "puttzoo", "PuttZoo", kGenMac },
 	{ "racedemo", "RaceDemo", kGenMac },
+	{ "samnmax", "ramnmax", kGenPC }, // Used in some releases of Russian Sam'n'Max
 	{ "SamsFunShop", "Sam's FunShop", kGenMac },
 	{ "sf2-demo", "Spy Fox 2 - Demo", kGenMac },
 	{ "sf2-demo", "sf2demo", kGenPC }, // FIXME: check this with joostp. Used by NL version?
@@ -2846,12 +2847,11 @@
 		} else if (g->features & GF_HUMONGOUS) {
 			strcpy(detectName, base);
 			strcat(detectName, ".he0");
-			strcpy(tempName, base);
-			strcat(tempName, ".he0");
 		} else {
 			strcpy(detectName, base);
 			strcat(detectName, ".000");
 		}
+		strcpy(tempName, detectName);
 
 		substIsOver = false;
 		substLastIndex = 0;
@@ -3022,12 +3022,11 @@
 	} else if (g->features & GF_HUMONGOUS) {
 		strcpy(detectName, name);
 		strcat(detectName, ".he0");
-		strcpy(tempName, name);
-		strcat(tempName, ".he0");
 	} else {
 		strcpy(detectName, name);
 		strcat(detectName, ".000");
 	}
+	strcpy(tempName, detectName);
 
 	bool substIsOver = false;
 	File f;





More information about the Scummvm-git-logs mailing list