- fixed map name setup

This was broken when localization for Hexen was added.
This commit is contained in:
Christoph Oelckers 2019-02-13 00:47:03 +01:00
parent ef050d700c
commit 8efc3188b9

View file

@ -1925,20 +1925,23 @@ level_info_t *FMapInfoParser::ParseMapHeader(level_info_t &defaultinfo)
levelinfo->flags |= LEVEL_LOOKUPLEVELNAME; levelinfo->flags |= LEVEL_LOOKUPLEVELNAME;
levelinfo->LevelName = sc.String; levelinfo->LevelName = sc.String;
} }
else if (HexenHack) else
{ {
levelinfo->LevelName = sc.String; levelinfo->LevelName = sc.String;
// Try to localize Hexen's map names. if (HexenHack)
int fileno = Wads.GetLumpFile(sc.LumpNum);
auto fn = Wads.GetWadName(fileno);
if (fn && (!stricmp(fn, "HEXEN.WAD") || !stricmp(fn, "HEXDD.WAD")))
{ {
FStringf key("TXT_%.5s_%s", fn, levelinfo->MapName.GetChars()); // Try to localize Hexen's map names.
if (GStrings.exists(key)) int fileno = Wads.GetLumpFile(sc.LumpNum);
auto fn = Wads.GetWadName(fileno);
if (fn && (!stricmp(fn, "HEXEN.WAD") || !stricmp(fn, "HEXDD.WAD")))
{ {
levelinfo->flags |= LEVEL_LOOKUPLEVELNAME; FStringf key("TXT_%.5s_%s", fn, levelinfo->MapName.GetChars());
levelinfo->LevelName = key; if (GStrings.exists(key))
{
levelinfo->flags |= LEVEL_LOOKUPLEVELNAME;
levelinfo->LevelName = key;
}
} }
} }
} }