From 8efc3188b999593485d9db5f1ce21ed02aebb159 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 13 Feb 2019 00:47:03 +0100
Subject: [PATCH] - fixed map name setup
This was broken when localization for Hexen was added.
---
src/gamedata/g_mapinfo.cpp | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/gamedata/g_mapinfo.cpp b/src/gamedata/g_mapinfo.cpp
index 73c7aaf42..826f44181 100644
--- a/src/gamedata/g_mapinfo.cpp
+++ b/src/gamedata/g_mapinfo.cpp
@@ -1925,20 +1925,23 @@ level_info_t *FMapInfoParser::ParseMapHeader(level_info_t &defaultinfo)
levelinfo->flags |= LEVEL_LOOKUPLEVELNAME;
levelinfo->LevelName = sc.String;
}
- else if (HexenHack)
+ else
{
levelinfo->LevelName = sc.String;
- // Try to localize Hexen's map names.
- int fileno = Wads.GetLumpFile(sc.LumpNum);
- auto fn = Wads.GetWadName(fileno);
- if (fn && (!stricmp(fn, "HEXEN.WAD") || !stricmp(fn, "HEXDD.WAD")))
+ if (HexenHack)
{
- FStringf key("TXT_%.5s_%s", fn, levelinfo->MapName.GetChars());
- if (GStrings.exists(key))
+ // Try to localize Hexen's map names.
+ 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;
- levelinfo->LevelName = key;
+ FStringf key("TXT_%.5s_%s", fn, levelinfo->MapName.GetChars());
+ if (GStrings.exists(key))
+ {
+ levelinfo->flags |= LEVEL_LOOKUPLEVELNAME;
+ levelinfo->LevelName = key;
+ }
}
}
}