diff options
Diffstat (limited to 'src/d_iwad.c')
| -rw-r--r-- | src/d_iwad.c | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/src/d_iwad.c b/src/d_iwad.c index a6187c10..d0bfe692 100644 --- a/src/d_iwad.c +++ b/src/d_iwad.c @@ -424,27 +424,29 @@ static GameMission_t IdentifyIWADByName(char *name, int mask) { size_t i; GameMission_t mission; + char *p; + + p = strrchr(name, DIR_SEPARATOR); + + if (p != NULL) + { + name = p + 1; + } mission = none; for (i=0; i<arrlen(iwads); ++i) { - char *iwadname; + // Check if the filename is this IWAD name. // Only use supported missions: if (((1 << iwads[i].mission) & mask) == 0) continue; - iwadname = DEH_String(iwads[i].name); - - if (strlen(name) < strlen(iwadname)) - continue; - // Check if it ends in this IWAD name. - if (!strcasecmp(name + strlen(name) - strlen(iwadname), - iwadname)) + if (!strcasecmp(name, iwads[i].name)) { mission = iwads[i].mission; break; @@ -729,3 +731,31 @@ iwad_t **D_FindAllIWADs(int mask) return result; } +// +// Get the IWAD name used for savegames. +// + +char *D_SaveGameIWADName(GameMission_t gamemission) +{ + size_t i; + + // Determine the IWAD name to use for savegames. + // This determines the directory the savegame files get put into. + // + // Note that we match on gamemission rather than on IWAD name. + // This ensures that doom1.wad and doom.wad saves are stored + // in the same place. + + for (i=0; i<arrlen(iwads); ++i) + { + if (gamemission == iwads[i].mission) + { + return iwads[i].name; + } + } + + // Default fallback: + + return "unknown.wad"; +} + |