always append WAD file name to savegame namess, even for IWADs

Why the inconsistency?
This commit is contained in:
Fabian Greffrath 2022-02-18 08:13:26 +01:00
parent 89c929e5f9
commit 494e556f5f

View File

@ -1056,29 +1056,19 @@ void M_DoSave(int slot)
// [FG] generate a default save slot name when the user saves to an empty slot // [FG] generate a default save slot name when the user saves to an empty slot
static void SetDefaultSaveName (int slot) static void SetDefaultSaveName (int slot)
{ {
// map from IWAD or PWAD? char *wadname = M_StringDuplicate(W_WadNameForLump(maplumpnum));
if (W_IsIWADLump(maplumpnum)) char *ext = strrchr(wadname, '.');
{
M_snprintf(savegamestrings[itemOn], SAVESTRINGSIZE,
"%s", lumpinfo[maplumpnum].name);
}
else
{
char *wadname = M_StringDuplicate(W_WadNameForLump(maplumpnum));
char *ext = strrchr(wadname, '.');
if (ext != NULL) if (ext != NULL)
{ {
*ext = '\0'; *ext = '\0';
}
M_snprintf(savegamestrings[itemOn], SAVESTRINGSIZE,
"%s (%s)", lumpinfo[maplumpnum].name,
wadname);
(free)(wadname);
} }
M_ForceUppercase(savegamestrings[itemOn]); M_snprintf(savegamestrings[slot], SAVESTRINGSIZE,
"%s (%s)", lumpinfo[maplumpnum].name, wadname);
(free)(wadname);
M_ForceUppercase(savegamestrings[slot]);
} }
// [FG] override savegame name if it already starts with a map identifier // [FG] override savegame name if it already starts with a map identifier
@ -4776,7 +4766,10 @@ boolean M_Responder (event_t* ev)
{ {
if (saveCharIndex > 0) if (saveCharIndex > 0)
{ {
saveCharIndex--; if (StartsWithMapIdentifier(savegamestrings[saveSlot]))
saveCharIndex = 0;
else
saveCharIndex--;
savegamestrings[saveSlot][saveCharIndex] = 0; savegamestrings[saveSlot][saveCharIndex] = 0;
} }
} }