zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 14:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- load Doom translations when parsing UMAPINFO in order to activate the correct boss specials

Browse source 
- one typo (only on a comment) change
This commit is contained in:
Rachael Alexanderson 2017-12-30 16:20:52 -05:00
parent 8f7ca00d19
commit 340f1fce30
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_mapinfo.cpp
View file

@ -2233,7 +2233,7 @@ void G_ParseMapInfo (FString basemapinfo)
} }
if (nindex != 2) 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); FMapInfoParser parse(nindex == 1 ? FMapInfoParser::FMT_New : FMapInfoParser::FMT_Unknown);
level_info_t defaultinfo; level_info_t defaultinfo;
parse.ParseMapInfo(lump, gamedefaults, defaultinfo); parse.ParseMapInfo(lump, gamedefaults, defaultinfo);

2
src/umapinfo.cpp
View file

@ -332,6 +332,8 @@ static int ParseMapEntry(FScanner &scanner, UMapEntry *val)
int ParseUMapInfo(int lumpnum) int ParseUMapInfo(int lumpnum)
{ {
P_LoadTranslator("xlat/doom.txt");
FScanner scanner(lumpnum); FScanner scanner(lumpnum);
unsigned int i; unsigned int i;