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.

svn-id: r17179

1 files changed, 3 insertions, 4 deletions

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 41dddf17c2..113ac429ff 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -545,6 +545,7 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "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 @@ DetectedGameList Engine_SCUMM_detectGames(const FSList &fslist) {
 		} 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 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
 	} 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;