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

- removed some redundancy.

Browse source
This commit is contained in:
Christoph Oelckers 2016-10-14 23:13:08 +02:00
parent 08504dcbe2
commit 2e882a41a3
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_conversation.cpp
View file

@ -750,7 +750,6 @@ public:
char goodbye[25]; char goodbye[25];
mysnprintf(goodbye, countof(goodbye), "TXT_RANDOMGOODBYE_%d", 1 + (pr_randomspeech() % NUM_RANDOM_GOODBYES)); mysnprintf(goodbye, countof(goodbye), "TXT_RANDOMGOODBYE_%d", 1 + (pr_randomspeech() % NUM_RANDOM_GOODBYES));
goodbyestr = GStrings[goodbye]; goodbyestr = GStrings[goodbye];
if (goodbyestr == nullptr) goodbyestr = "Bye.";
} }
else if (strncmp(goodbyestr, "RANDOM_", 7) == 0) else if (strncmp(goodbyestr, "RANDOM_", 7) == 0)
{ {
@ -758,13 +757,12 @@ public:
byetext.Format("TXT_%s_%02d", goodbyestr, 1 + (pr_randomspeech() % NUM_RANDOM_LINES)); byetext.Format("TXT_%s_%02d", goodbyestr, 1 + (pr_randomspeech() % NUM_RANDOM_LINES));
goodbyestr = GStrings[byetext]; goodbyestr = GStrings[byetext];
if (goodbyestr == nullptr) goodbyestr = "Bye.";
} }
else if (goodbyestr[0] == '$') else if (goodbyestr[0] == '$')
{ {
goodbyestr = GStrings(goodbyestr + 1); goodbyestr = GStrings(goodbyestr + 1);
if (goodbyestr == nullptr) goodbyestr = "Bye.";
} }
if (goodbyestr == nullptr) goodbyestr = "Bye.";
mResponses.Push(mResponseLines.Size()); mResponses.Push(mResponseLines.Size());
mResponseLines.Push(FString(goodbyestr)); mResponseLines.Push(FString(goodbyestr));