From f4e9edccb9f6eb0cb4a368070a780229e59e1f7d Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 19 Nov 2013 19:55:57 -0600 Subject: [PATCH] Don't display the cost in dialogues twice - Fixed: Commit 75dd5503, which was to enable the use of LANGUAGE substitutions for conversation items with a cost attached, neglected to remove the original code that attached the cost to the end of the item, so the cost got added twice. --- src/p_conversation.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index e51389ce8..6493bca36 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -522,19 +522,8 @@ static void ParseReplies (FStrifeDialogueReply **replyptr, Response *responses) // If the first item check has a positive amount required, then // add that to the reply string. Otherwise, use the reply as-is. - if (rsp->Count[0] > 0) - { - char moneystr[128]; - - mysnprintf (moneystr, countof(moneystr), "%s for %u", rsp->Reply, rsp->Count[0]); - reply->Reply = copystring (moneystr); - reply->NeedsGold = true; - } - else - { - reply->Reply = copystring (rsp->Reply); - reply->NeedsGold = false; - } + reply->Reply = copystring (rsp->Reply); + reply->NeedsGold = (rsp->Count[0] > 0); // QuickYes messages are shown when you meet the item checks. // QuickNo messages are shown when you don't.