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

Merge pull request #1540 from def-/pr-disconnect-time

Browse source 
Add cl_confirm_disconnect_quit_time (fixes #1530)
This commit is contained in:
Dennis Felsing 2019-03-28 23:38:16 +01:00 committed by GitHub
parent 72200a4e09 8908102536
commit 95cc357dd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 61 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/engine/client.h
View file

@ -179,6 +179,8 @@ public:
virtual const char *GetCurrentMapPath() = 0;
virtual unsigned GetMapCrc() = 0;
virtual int GetCurrentRaceTime() = 0;
virtual void RaceRecord_Start(const char *pFilename) = 0;
virtual void RaceRecord_Stop() = 0;
virtual bool RaceRecord_IsRecording() = 0;
@ -220,6 +222,7 @@ public:
virtual int OnSnapInput(int *pData, bool Dummy, bool Force) = 0;
virtual void OnDummySwap() = 0;
virtual void SendDummyInfo(bool Start) = 0;
virtual int GetLastRaceTick() = 0;
virtual const char *GetItemName(int Type) = 0;
virtual const char *Version() = 0;

7
src/engine/client/client.cpp
View file

@ -824,6 +824,13 @@ void CClient::DummyDisconnect(const char *pReason)
GameClient()->OnDummyDisconnect();
}
int CClient::GetCurrentRaceTime()
{
if(GameClient()->GetLastRaceTick() < 0)
return 0;
return (GameTick() - GameClient()->GetLastRaceTick()) / 50;
}
int CClient::SendMsgExY(CMsgPacker *pMsg, int Flags, bool System, int NetClient)
{
CNetChunk Packet;

2
src/engine/client/client.h
View file

@ -397,6 +397,8 @@ public:
void GenerateTimeoutSeed();
void GenerateTimeoutCodes();
virtual int GetCurrentRaceTime();
const char *GetCurrentMap();
const char *GetCurrentMapPath();
unsigned GetMapCrc();

2
src/engine/shared/config_variables.h
View file

@ -387,7 +387,7 @@ MACRO_CONFIG_INT(ClChatReset, cl_chat_reset, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAV
MACRO_CONFIG_INT(ClShowDirection, cl_show_direction, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Show tee direction")
MACRO_CONFIG_INT(ClHttpMapDownload, cl_http_map_download, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Try fast HTTP map download first")
MACRO_CONFIG_INT(ClOldGunPosition, cl_old_gun_position, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Tees hold gun a bit higher like in TW 0.6.1 and older")
MACRO_CONFIG_INT(ClConfirmDisconnect, cl_confirm_disconnect, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Confirmation popup before disconnecting")
MACRO_CONFIG_INT(ClConfirmDisconnectQuitTime, cl_confirm_disconnect_quit_time, 20, -1, 1440, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Confirmation popup before disconnecting/quitting after game time (in minutes, -1 to turn off, 0 to always turn on)")
MACRO_CONFIG_STR(ClTimeoutCode, cl_timeout_code, 64, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Timeout code to use")
MACRO_CONFIG_STR(ClDummyTimeoutCode, cl_dummy_timeout_code, 64, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Dummy Timeout code to use")
MACRO_CONFIG_STR(ClTimeoutSeed, cl_timeout_seed, 64, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Timeout seed")

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

@ -263,7 +263,7 @@ void CGhost::OnNewSnapshot()
{
CServerInfo ServerInfo;
Client()->GetServerInfo(&ServerInfo);
if(!IsRace(&ServerInfo) || !g_Config.m_ClRaceGhost || Client()->State() != IClient::STATE_ONLINE)
if(!IsRace(&ServerInfo) || Client()->State() != IClient::STATE_ONLINE)
return;
if(!m_pClient->m_Snap.m_pGameInfoObj || m_pClient->m_Snap.m_SpecInfo.m_Active || !m_pClient->m_Snap.m_pLocalCharacter || !m_pClient->m_Snap.m_pLocalPrevCharacter)
return;
@ -271,6 +271,8 @@ void CGhost::OnNewSnapshot()
bool RaceFlag = m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags&GAMESTATEFLAG_RACETIME;
bool ServerControl = RaceFlag && g_Config.m_ClRaceGhostServerControl;
if(g_Config.m_ClRaceGhost)
{
if(!ServerControl)
CheckStartLocal(false);
else
@ -278,7 +280,9 @@ void CGhost::OnNewSnapshot()
if(m_Recording)
AddInfos(m_pClient->m_Snap.m_pLocalCharacter);
}
// Record m_LastRaceTick for g_Config.m_ClConfirmDisconnectQuitTime anyway
int RaceTick = -m_pClient->m_Snap.m_pGameInfoObj->m_WarmupTimer;
m_LastRaceTick = RaceFlag ? RaceTick : -1;
}
@ -622,3 +626,8 @@ void CGhost::OnMapLoad()
m_pClient->m_pMenus->GhostlistPopulate();
m_AllowRestart = false;
}
int CGhost::GetLastRaceTick()
{
return m_LastRaceTick;
}

2
src/game/client/components/ghost.h
View file

@ -165,6 +165,8 @@ public:
class IGhostLoader *GhostLoader() const { return m_pGhostLoader; }
class IGhostRecorder *GhostRecorder() const { return m_pGhostRecorder; }
int GetLastRaceTick();
};
#endif

10
src/game/client/components/menus.cpp
View file

@ -819,7 +819,16 @@ int CMenus::RenderMenubar(CUIRect r)
Box.VSplitRight(33.0f, &Box, &Button);
static int s_QuitButton=0;
if(DoButton_MenuTab(&s_QuitButton, "\xEE\x97\x8D", 0, &Button, CUI::CORNER_T))
{
if(m_pClient->Editor()->HasUnsavedData() || Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmDisconnectQuitTime)
{
m_Popup = POPUP_QUIT;
}
else
{
Client()->Quit();
}
}
Box.VSplitRight(10.0f, &Box, &Button);
Box.VSplitRight(33.0f, &Box, &Button);
@ -1217,7 +1226,6 @@ int CMenus::Render()
#endif
// additional info
Box.HSplitTop(10.0f, 0, &Box);
Box.VMargin(20.f/UI()->Scale(), &Box);
if(m_pClient->Editor()->HasUnsavedData())
{

13
src/game/client/components/menus_ingame.cpp
View file

@ -54,11 +54,15 @@ void CMenus::RenderGame(CUIRect MainView)
static int s_DisconnectButton = 0;
if(DoButton_Menu(&s_DisconnectButton, Localize("Disconnect"), 0, &Button))
{
if(g_Config.m_ClConfirmDisconnect)
if(Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmDisconnectQuitTime)
{
m_Popup = POPUP_DISCONNECT;
}
else
{
Client()->Disconnect();
}
}
static int s_SpectateButton = 0;
static int s_JoinRedButton = 0;
@ -148,11 +152,18 @@ void CMenus::RenderGame(CUIRect MainView)
Client()->DummyConnect();
}
else
{
if(Client()->GetCurrentRaceTime() / 60 >= g_Config.m_ClConfirmDisconnectQuitTime)
{
m_Popup = POPUP_DISCONNECT;
}
else
{
Client()->DummyDisconnect(0);
}
}
}
}
void CMenus::RenderPlayers(CUIRect MainView)
{

5
src/game/client/gameclient.cpp
View file

@ -689,6 +689,11 @@ void CGameClient::OnDummyDisconnect()
m_LastNewPredictedTick[1] = -1;
}
int CGameClient::GetLastRaceTick()
{
return m_pGhost->GetLastRaceTick();
}
void CGameClient::OnRelease()
{
// release all systems

2
src/game/client/gameclient.h
View file

@ -382,6 +382,8 @@ public:
CWeaponData *GetWeaponData(int Tick) { return &m_aWeaponData[((Tick%150)+150)%150]; }
CWeaponData *FindWeaponData(int TargetTick);
virtual int GetLastRaceTick();
void FindWeaker(bool IsWeaker[2][MAX_CLIENTS]);
bool AntiPingPlayers() { return g_Config.m_ClAntiPing && g_Config.m_ClAntiPingPlayers && !m_Snap.m_SpecInfo.m_Active && Client()->State() != IClient::STATE_DEMOPLAYBACK && (m_Tuning[g_Config.m_ClDummy].m_PlayerCollision || m_Tuning[g_Config.m_ClDummy].m_PlayerHooking); }