edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Robert Müller 2023-05-19 15:27:03 +02:00
parent 1bea7a2cd5
commit 2e46460302
2 changed files with 10 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,6 +7,7 @@
#include <base/vmath.h>
#include <chrono>
#include <optional>
#include <unordered_set>
#include <vector>
@ -562,7 +563,7 @@ protected:
// found in menus_browser.cpp
int m_SelectedIndex;
void RenderServerbrowserServerList(CUIRect View);
void Connect(const char *pAddress);
void Connect(const char *pAddress, std::optional<bool> Official = {});
void PopupConfirmSwitchServer();
void RenderServerbrowserServerDetail(CUIRect View);
void RenderServerbrowserFilters(CUIRect View);

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

@ -585,9 +585,14 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
}
}
void CMenus::Connect(const char *pAddress)
void CMenus::Connect(const char *pAddress, std::optional<bool> Official)
{
if(Client()->State() == IClient::STATE_ONLINE && Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmDisconnectTime && g_Config.m_ClConfirmDisconnectTime >= 0)
if(Official.has_value() && !Official.value())
{
str_copy(m_aNextServer, pAddress);
PopupConfirm(Localize("Non-official server"), Localize("Are you sure that you want to connect to a non-official server?"), Localize("Yes"), Localize("No"), &CMenus::PopupConfirmSwitchServer);
}
else if(Client()->State() == IClient::STATE_ONLINE && Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmDisconnectTime && g_Config.m_ClConfirmDisconnectTime >= 0)
{
str_copy(m_aNextServer, pAddress);
PopupConfirm(Localize("Disconnect"), Localize("Are you sure that you want to disconnect and switch to a different server?"), Localize("Yes"), Localize("No"), &CMenus::PopupConfirmSwitchServer);
@ -1509,7 +1514,7 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
str_copy(g_Config.m_UiServerAddress, Friend.ServerInfo()->m_aAddress);
if(Input()->MouseDoubleClick())
{
Connect(g_Config.m_UiServerAddress);
Connect(g_Config.m_UiServerAddress, Friend.ServerInfo()->m_Official);
}
}
}