Permalink
Browse files

- removed the special exception for those weird "No..." messages and …

…moved the only one that isn't garbage to the language lump.
  • Loading branch information...
coelckers committed Feb 10, 2019
1 parent 9af171f commit 993a16787cb405d86525d92084ff410a6f6e2da9
Showing with 4 additions and 10 deletions.
  1. +2 −10 src/p_conversation.cpp
  2. +2 −0 wadsrc_extra/static/language.enu
@@ -599,16 +599,8 @@ static void ParseReplies (const char *name, int pos, FStrifeDialogueReply **repl
}
if (reply->ItemCheck[0].Item != 0)
{
if (name && strncmp(rsp->No, "NO. ", 4)) // All 'no' nodes starting with 'NO.' won't ever be shown and they all contain broken text.
{
FStringf label("$TXT_RNO%d_%s_d%d_%s", j, name, pos, TokenFromString(rsp->No).GetChars());
reply->QuickNo = label;
}
else
{
reply->QuickNo = rsp->No;
}

FStringf label("$TXT_RNO%d_%s_d%d_%s", j, name, pos, TokenFromString(rsp->No).GetChars());
reply->QuickNo = label;
}
else
{
@@ -200,6 +200,8 @@ TXT_DLG_SCRIPT02_d15160_HELLO = "HELLO FRIEND. WHAT CAN I GET FOR YOU?";
TXT_RPLY0_SCRIPT02_d15160_ELECT = "ELECTRIC BOLTS";
TXT_RYES0_SCRIPT02_d15160_YOUGO = "you got the ELECTRIC BOLTS.";
TXT_RPLY1_SCRIPT02_d15160_AMMOS = "AMMO SATCHEL";
$TXT_RNO0_SCRIPT02_d15160_NOYOU = "NO. you don't have what i want for the ELECTRIC BOLTS!";
$TXT_RNO0_SCRIPT02_d16676_NOYOU = "NO. you don't have what i want for the ELECTRIC BOLTS!";
TXT_RYES1_SCRIPT02_d15160_THANK = "THANK YOU. ANYTHING ELSE?";
TXT_RNO1_SCRIPT02_d15160_YOUCA = "YOU CAN'T AFFORD THAT, GOOD DAY.";
TXT_DLG_SCRIPT02_d16676_WHATC = "WHAT CAN I GET FOR YOU?";

1 comment on commit 993a167

@Nemrtvi

This comment has been minimized.

Copy link
Contributor

Nemrtvi commented on 993a167 Feb 10, 2019

Seems like an accidental “$” was added to the language file.

Please sign in to comment.