edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add popup to confirm connecting to friend on non-official server"

Browse source 
This reverts commit 2e46460302.
This commit is contained in:
Dennis Felsing 2023-05-19 20:31:59 +02:00
parent cca040274f
commit 3593cce9b4
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/client/components/menus.h
View file

@ -7,7 +7,6 @@
#include <base/vmath.h> #include <base/vmath.h>
#include <chrono> #include <chrono>
#include <optional>
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
@ -563,7 +562,7 @@ protected:
// found in menus_browser.cpp // found in menus_browser.cpp
int m_SelectedIndex; int m_SelectedIndex;
void RenderServerbrowserServerList(CUIRect View); void RenderServerbrowserServerList(CUIRect View);
void Connect(const char *pAddress, std::optional<bool> Official = {}); void Connect(const char *pAddress);
void PopupConfirmSwitchServer(); void PopupConfirmSwitchServer();
void RenderServerbrowserServerDetail(CUIRect View); void RenderServerbrowserServerDetail(CUIRect View);
void RenderServerbrowserFilters(CUIRect View); void RenderServerbrowserFilters(CUIRect View);

4
src/game/client/components/menus_browser.cpp
View file

@ -585,7 +585,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
} }
} }
void CMenus::Connect(const char *pAddress, std::optional<bool> 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) 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); str_copy(g_Config.m_UiServerAddress, Friend.ServerInfo()->m_aAddress);
if(Input()->MouseDoubleClick()) if(Input()->MouseDoubleClick())
{ {
Connect(g_Config.m_UiServerAddress, Friend.ServerInfo()->m_Official); Connect(g_Config.m_UiServerAddress);
} }
} }
} }