From 2e882a41a33f0a7d45d229a817e5a9db2ce4e725 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 14 Oct 2016 23:13:08 +0200 Subject: [PATCH] - removed some redundancy. --- src/p_conversation.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index 1762ae98e..f216d9d78 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -750,7 +750,6 @@ public: char goodbye[25]; mysnprintf(goodbye, countof(goodbye), "TXT_RANDOMGOODBYE_%d", 1 + (pr_randomspeech() % NUM_RANDOM_GOODBYES)); goodbyestr = GStrings[goodbye]; - if (goodbyestr == nullptr) goodbyestr = "Bye."; } else if (strncmp(goodbyestr, "RANDOM_", 7) == 0) { @@ -758,13 +757,12 @@ public: byetext.Format("TXT_%s_%02d", goodbyestr, 1 + (pr_randomspeech() % NUM_RANDOM_LINES)); goodbyestr = GStrings[byetext]; - if (goodbyestr == nullptr) goodbyestr = "Bye."; } else if (goodbyestr[0] == '$') { goodbyestr = GStrings(goodbyestr + 1); - if (goodbyestr == nullptr) goodbyestr = "Bye."; } + if (goodbyestr == nullptr) goodbyestr = "Bye."; mResponses.Push(mResponseLines.Size()); mResponseLines.Push(FString(goodbyestr));