diff options
| author | Max Horn | 2005-04-10 17:20:24 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-10 17:20:24 +0000 |
| commit | 8df392cabe96b76d93ef922fcccb79d38cb1d622 (patch) | |
| tree | 6265a216cd2587bca237c018b0caf29253a3d1b0 | |
| parent | f35ac50111739a87aa6c639e21b55632af79796a (diff) | |
| download | scummvm-rg350-8df392cabe96b76d93ef922fcccb79d38cb1d622.tar.gz scummvm-rg350-8df392cabe96b76d93ef922fcccb79d38cb1d622.tar.bz2 scummvm-rg350-8df392cabe96b76d93ef922fcccb79d38cb1d622.zip | |
Fix for bug #1167146 (properly fix the monkey vs. monkey1 issue by using the substResFileNameTable table)
svn-id: r17524
| -rw-r--r-- | scumm/scumm.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 1305c4ace1..c18562447d 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -502,6 +502,7 @@ static SubstResFileNames substResFileNameTable[] = { { "00.LFL", "Maniac Mansion (F).prg", kGenAsIs }, { "00.LFL", "Maniac Mansion (SW).prg", kGenAsIs }, { "00.LFL", "Maniac Mansion (U).prg", kGenAsIs }, + { "monkey", "monkey1", kGenPC}, { "racedemo", "500demo", kGenPC}, { "Spydemo", "foxdemo", kGenPC}, { "Spydemo", "FoxDemo", kGenMac }, @@ -2407,19 +2408,6 @@ DetectedGameList Engine_SCUMM_detectGames(const FSList &fslist) { const char *target = elem->target; - // HACK to work around bug #1009344 - if (!strcmp(target, "monkey")) { - const char *str = name; - int len = 0; - // Scan to the end of the string... - while (*str++) - len++; - // ...so that we can check if it ends with 'monkey1.000' - const char *monkey1 = "monkey1.000"; // Len: 11 - if (len >= 11 && !scumm_stricmp(str-11-1, monkey1)) - target = "monkey1"; - } - // Find the GameSettings for that target for (g = scumm_settings; g->name; ++g) { if (0 == scumm_stricmp(g->name, target)) |