OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- exported Strife's log texts to the string table.

Browse source 
This is dpne as a two-stage approach. TXT_LOGTEXTxxx will always take precedence over the log lumps, and TXT_ILOGxxx will only replace the original IWAD content.
This is so that PWADs replacing these lumps don't get overridden by the default texts.
This commit is contained in:
Christoph Oelckers 2019-02-09 12:52:50 +01:00
commit b1820039d7
3 changed files with 134 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/gamedata/stringtable.cpp
View file

@ -124,7 +124,14 @@ void FStringTable::LoadLanguage (int lumpnum)
sc.MustGetStringName("ifgame");
sc.MustGetStringName("(");
sc.MustGetString();
skip |= !sc.Compare(GameTypeName());
if (sc.Compare("strifeteaser"))
{
skip |= (gameinfo.gametype != GAME_Strife) || !(gameinfo.flags & GI_SHAREWARE);
}
else
{
skip |= !sc.Compare(GameTypeName());
}
sc.MustGetStringName(")");
sc.MustGetString();
@ -141,10 +148,13 @@ void FStringTable::LoadLanguage (int lumpnum)
strText += sc.String;
sc.MustGetString ();
}
// Insert the string into all relevant tables.
for (auto map : activeMaps)
if (!skip)
{
allStrings[map].Insert(strName, strText);
// Insert the string into all relevant tables.
for (auto map : activeMaps)
{
allStrings[map].Insert(strName, strText);
}
}
}
}