From 340f1fce30b633b07bf49e0ec65682c123ab2eef Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 30 Dec 2017 16:20:52 -0500 Subject: [PATCH] - load Doom translations when parsing UMAPINFO in order to activate the correct boss specials - one typo (only on a comment) change --- src/g_mapinfo.cpp | 2 +- src/umapinfo.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp index 0481c17846..951b6a346d 100644 --- a/src/g_mapinfo.cpp +++ b/src/g_mapinfo.cpp @@ -2233,7 +2233,7 @@ void G_ParseMapInfo (FString basemapinfo) } if (nindex != 2) { - CommitUMapinfo(&gamedefaults); // UMPAINFOs are collected until a regular MAPINFO is found so that they properly use the base settings. + CommitUMapinfo(&gamedefaults); // UMAPINFOs are collected until a regular MAPINFO is found so that they properly use the base settings. FMapInfoParser parse(nindex == 1 ? FMapInfoParser::FMT_New : FMapInfoParser::FMT_Unknown); level_info_t defaultinfo; parse.ParseMapInfo(lump, gamedefaults, defaultinfo); diff --git a/src/umapinfo.cpp b/src/umapinfo.cpp index b6b435c40f..b332a072ad 100644 --- a/src/umapinfo.cpp +++ b/src/umapinfo.cpp @@ -332,6 +332,8 @@ static int ParseMapEntry(FScanner &scanner, UMapEntry *val) int ParseUMapInfo(int lumpnum) { + P_LoadTranslator("xlat/doom.txt"); + FScanner scanner(lumpnum); unsigned int i;