Permalink
Browse files

Only replace Strife dialogue content if the default strings from zd_e…

…xtra.pk3 are present.

If not, use the dialogue file's content directly.
  • Loading branch information...
coelckers committed Feb 10, 2019
1 parent 3a440a5 commit 6d19374ae866699321d1dda318a0c9d495fc3d72
Showing with 36 additions and 4 deletions.
  1. +26 −0 src/gamedata/stringtable.cpp
  2. +1 −0 src/gamedata/stringtable.h
  3. +9 −4 src/p_conversation.cpp
@@ -208,6 +208,32 @@ size_t FStringTable::ProcessEscapes (char *iptr)
return optr - sptr;
}

bool FStringTable::exists(const char *name)
{
// Checks if the given key exists in any one of the default string tables that are valid for all languages.
// To replace IWAD content this condition must be true.
if (name == nullptr || *name == 0)
{
return false;
}
FName nm(name, true);
if (nm != NAME_None)
{
uint32_t defaultStrings[] = { MAKE_ID('*', '*', '*', 0), MAKE_ID('*', 0, 0, 0), MAKE_ID('*', '*', 0, 0) };

for (auto mapid : defaultStrings)
{
auto map = allStrings.CheckKey(mapid);
if (map)
{
auto item = map->CheckKey(nm);
if (item) return true;
}
}
}
return false;
}

// Finds a string by name and returns its value
const char *FStringTable::operator[] (const char *name) const
{
@@ -71,6 +71,7 @@ class FStringTable

const char *operator() (const char *name) const; // Never returns NULL
const char *operator[] (const char *name) const; // Can return NULL
bool exists(const char *name);

private:

@@ -352,7 +352,7 @@ static FStrifeDialogueNode *ReadRetailNode (FLevelLocals *Level, const char *nam
if (name)
{
FStringf label("$TXT_DLG_%s_d%d_%s", name, int(pos), TokenFromString(speech.Dialogue).GetChars());
node->Dialogue = label;
node->Dialogue = GStrings.exists(label)? label : FString(speech.Dialogue);
}
else
{
@@ -376,6 +376,8 @@ static FStrifeDialogueNode *ReadRetailNode (FLevelLocals *Level, const char *nam
label.ReplaceChars(' ', '_');
label.ReplaceChars('\'', '_');
node->SpeakerName.Format("$TXT_SPEAKER_%s", label.GetChars());
if (!GStrings.exists(node->SpeakerName)) node->SpeakerName = speech.Name;

}
else
{
@@ -446,7 +448,7 @@ static FStrifeDialogueNode *ReadTeaserNode (FLevelLocals *Level, const char *nam
if (name)
{
FStringf label("$TXT_DLG_%s_d%d_%s", name, pos, TokenFromString(speech.Dialogue).GetChars());
node->Dialogue = label;
node->Dialogue = GStrings.exists(label)? label : FString(speech.Dialogue);
}
else
{
@@ -475,6 +477,7 @@ static FStrifeDialogueNode *ReadTeaserNode (FLevelLocals *Level, const char *nam
label.ReplaceChars(' ', '_');
label.ReplaceChars('\'', '_');
node->SpeakerName.Format("$TXT_SPEAKER_%s", label.GetChars());
if (!GStrings.exists(node->SpeakerName)) node->SpeakerName = speech.Name;
}
else
{
@@ -566,6 +569,8 @@ static void ParseReplies (const char *name, int pos, FStrifeDialogueReply **repl
if (name)
{
FStringf label("$TXT_RPLY%d_%s_d%d_%s", j, name, pos, TokenFromString(rsp->Reply).GetChars());
reply->Reply = GStrings.exists(label)? label : FString(rsp->Reply);

reply->Reply = label;
}
else
@@ -590,7 +595,7 @@ static void ParseReplies (const char *name, int pos, FStrifeDialogueReply **repl
if (name)
{
FStringf label("$TXT_RYES%d_%s_d%d_%s", j, name, pos, TokenFromString(rsp->Yes).GetChars());
reply->QuickYes = label;
reply->QuickYes = GStrings.exists(label)? label : FString(rsp->Yes);
}
else
{
@@ -600,7 +605,7 @@ static void ParseReplies (const char *name, int pos, FStrifeDialogueReply **repl
if (reply->ItemCheck[0].Item != 0)
{
FStringf label("$TXT_RNO%d_%s_d%d_%s", j, name, pos, TokenFromString(rsp->No).GetChars());
reply->QuickNo = label;
reply->QuickNo = GStrings.exists(label)? label : FString(rsp->No);
}
else
{

0 comments on commit 6d19374

Please sign in to comment.