From 56aeb85eee8e142facafdc984be82b87a2f05db7 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 27 Jul 2012 02:35:00 +0000 Subject: [PATCH] - Fixed: menu_endgame showed no text during a netgame, nor did it block you from ending a netgame. SVN r3791 (trunk) --- src/menu/messagebox.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/menu/messagebox.cpp b/src/menu/messagebox.cpp index a97dc7bbad..e7b6abcef4 100644 --- a/src/menu/messagebox.cpp +++ b/src/menu/messagebox.cpp @@ -466,19 +466,7 @@ IMPLEMENT_CLASS(DEndGameMenu) DEndGameMenu::DEndGameMenu(bool playsound) { - int messageindex = gametic % gameinfo.quitmessages.Size(); - FString EndString = gameinfo.quitmessages[messageindex]; - - if (netgame) - { - EndString = GStrings("NETEND"); - return; - } - - EndString = GStrings("ENDGAME"); - - - Init(NULL, EndString, 0, playsound); + Init(NULL, GStrings(netgame ? "NETEND" : "ENDGAME"), 0, playsound); } //============================================================================= @@ -492,7 +480,10 @@ void DEndGameMenu::HandleResult(bool res) if (res) { M_ClearMenus (); - D_StartTitle (); + if (!netgame) + { + D_StartTitle (); + } } else {