zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 15:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed the special exception for those weird "No..." messages and moved the only one that isn't garbage to the language lump.

Browse source
This commit is contained in:
Christoph Oelckers 2019-02-10 09:59:05 +01:00
parent 9af171f308
commit 993a16787c
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_conversation.cpp
View file

@ -598,19 +598,11 @@ static void ParseReplies (const char *name, int pos, FStrifeDialogueReply **repl
} }
} }
if (reply->ItemCheck[0].Item != 0) 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()); FStringf label("$TXT_RNO%d_%s_d%d_%s", j, name, pos, TokenFromString(rsp->No).GetChars());
reply->QuickNo = label; reply->QuickNo = label;
} }
else else
{
reply->QuickNo = rsp->No;
}
}
else
{ {
reply->QuickNo = ""; reply->QuickNo = "";
} }

2
wadsrc_extra/static/language.enu
View file

@ -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_RPLY0_SCRIPT02_d15160_ELECT = "ELECTRIC BOLTS";
TXT_RYES0_SCRIPT02_d15160_YOUGO = "you got the ELECTRIC BOLTS."; TXT_RYES0_SCRIPT02_d15160_YOUGO = "you got the ELECTRIC BOLTS.";
TXT_RPLY1_SCRIPT02_d15160_AMMOS = "AMMO SATCHEL"; 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_RYES1_SCRIPT02_d15160_THANK = "THANK YOU. ANYTHING ELSE?";
TXT_RNO1_SCRIPT02_d15160_YOUCA = "YOU CAN'T AFFORD THAT, GOOD DAY."; TXT_RNO1_SCRIPT02_d15160_YOUCA = "YOU CAN'T AFFORD THAT, GOOD DAY.";
TXT_DLG_SCRIPT02_d16676_WHATC = "WHAT CAN I GET FOR YOU?"; TXT_DLG_SCRIPT02_d16676_WHATC = "WHAT CAN I GET FOR YOU?";