From 3593cce9b4b8dc75cb41f498166d7ef2762efa8d Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Fri, 19 May 2023 20:31:59 +0200 Subject: [PATCH] Revert "Add popup to confirm connecting to friend on non-official server" This reverts commit 2e46460302681cf6290d048b66dd9d935feba174. --- src/game/client/components/menus.h | 3 +-- src/game/client/components/menus_browser.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h index 69a7b1f92..ca024ba3e 100644 --- a/src/game/client/components/menus.h +++ b/src/game/client/components/menus.h @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -563,7 +562,7 @@ protected: // found in menus_browser.cpp int m_SelectedIndex; void RenderServerbrowserServerList(CUIRect View); - void Connect(const char *pAddress, std::optional Official = {}); + void Connect(const char *pAddress); void PopupConfirmSwitchServer(); void RenderServerbrowserServerDetail(CUIRect View); void RenderServerbrowserFilters(CUIRect View); diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index 45169a663..5dd302f3e 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -585,7 +585,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View) } } -void CMenus::Connect(const char *pAddress, std::optional Official) +void CMenus::Connect(const char *pAddress) { if(Client()->State() == IClient::STATE_ONLINE && Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmDisconnectTime && g_Config.m_ClConfirmDisconnectTime >= 0) { @@ -1509,7 +1509,7 @@ void CMenus::RenderServerbrowserFriends(CUIRect View) str_copy(g_Config.m_UiServerAddress, Friend.ServerInfo()->m_aAddress); if(Input()->MouseDoubleClick()) { - Connect(g_Config.m_UiServerAddress, Friend.ServerInfo()->m_Official); + Connect(g_Config.m_UiServerAddress); } } }