zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-31 13:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- changed Strife dialogue setup so that STRIFE00 is being processed and the random texts explicitly excluded.

Browse source 
This fixes the stray "Peasant" in this file.
This commit is contained in:
Christoph Oelckers 2019-03-24 12:52:03 +01:00
parent 92586e6c17
commit 04c103811c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/maploader/strifedialogue.cpp
View file

@ -157,7 +157,6 @@ bool MapLoader::LoadScriptFile (const char *name, bool include, int type)
auto fn = Wads.GetLumpFile(lumpnum); auto fn = Wads.GetLumpFile(lumpnum);
auto wadname = Wads.GetWadName(fn); auto wadname = Wads.GetWadName(fn);
if (stricmp(wadname, "STRIFE0.WAD") && stricmp(wadname, "STRIFE1.WAD") && stricmp(wadname, "SVE.WAD")) name = nullptr; // Only localize IWAD content. if (stricmp(wadname, "STRIFE0.WAD") && stricmp(wadname, "STRIFE1.WAD") && stricmp(wadname, "SVE.WAD")) name = nullptr; // Only localize IWAD content.
if (name && !stricmp(name, "SCRIPT00")) name = nullptr; // This only contains random string references which already use the string table.
bool res = LoadScriptFile(name, lumpnum, lump, Wads.LumpLength(lumpnum), include, type); bool res = LoadScriptFile(name, lumpnum, lump, Wads.LumpLength(lumpnum), include, type);
return res; return res;
@ -285,7 +284,7 @@ FStrifeDialogueNode *MapLoader::ReadRetailNode (const char *name, FileReader &lu
// Convert the rest of the data to our own internal format. // Convert the rest of the data to our own internal format.
if (name) if (name && strncmp(speech.Dialogue, "RANDOM_", 7))
{ {
FStringf label("$TXT_DLG_%s_d%d_%s", name, int(pos), TokenFromString(speech.Dialogue).GetChars()); FStringf label("$TXT_DLG_%s_d%d_%s", name, int(pos), TokenFromString(speech.Dialogue).GetChars());
node->Dialogue = GStrings.exists(label.GetChars()+1)? label : FString(speech.Dialogue); node->Dialogue = GStrings.exists(label.GetChars()+1)? label : FString(speech.Dialogue);
@ -381,7 +380,7 @@ FStrifeDialogueNode *MapLoader::ReadTeaserNode (const char *name, FileReader &lu
} }
// Convert the rest of the data to our own internal format. // Convert the rest of the data to our own internal format.
if (name) if (name && strncmp(speech.Dialogue, "RANDOM_", 7))
{ {
FStringf label("$TXT_DLG_%s_d%d_%s", name, pos, TokenFromString(speech.Dialogue).GetChars()); FStringf label("$TXT_DLG_%s_d%d_%s", name, pos, TokenFromString(speech.Dialogue).GetChars());
node->Dialogue = GStrings.exists(label.GetChars() + 1)? label : FString(speech.Dialogue); node->Dialogue = GStrings.exists(label.GetChars() + 1)? label : FString(speech.Dialogue);
@ -407,7 +406,7 @@ FStrifeDialogueNode *MapLoader::ReadTeaserNode (const char *name, FileReader &lu
// The speaker's name, if any. // The speaker's name, if any.
speech.Dialogue[0] = 0; //speech.Name[16] = 0; speech.Dialogue[0] = 0; //speech.Name[16] = 0;
if (name && speech.Name[0]) if ((name && speech.Name[0]))
{ {
FString label = speech.Name; FString label = speech.Name;
label.ReplaceChars(' ', '_'); label.ReplaceChars(' ', '_');