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

More sensitive afk detection

Browse source
This commit is contained in:
def 2014-02-21 18:27:00 +01:00
parent 65f0455f64
commit 0e15c22639
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/server/player.cpp
View file

@ -42,8 +42,6 @@ CPlayer::CPlayer(CGameContext *pGameServer, int ClientID, int Team)
m_LastCommandPos = 0;
m_LastPlaytime = time_get();
m_LastTarget_x = 0;
m_LastTarget_y = 0;
m_Sent1stAfkWarning = 0;
m_Sent2ndAfkWarning = 0;
m_ChatScore = 0;
@ -312,6 +310,8 @@ void CPlayer::OnPredictedInput(CNetObj_PlayerInput *NewInput)
if((m_PlayerFlags&PLAYERFLAG_CHATTING) && (NewInput->m_PlayerFlags&PLAYERFLAG_CHATTING))
return;
AfkVoteTimer(NewInput);
if(m_pCharacter && !m_Paused)
m_pCharacter->OnPredictedInput(NewInput);
}
@ -320,7 +320,7 @@ void CPlayer::OnDirectInput(CNetObj_PlayerInput *NewInput)
{
if (AfkTimer(NewInput->m_TargetX, NewInput->m_TargetY))
return; // we must return if kicked, as player struct is already deleted
AfkVoteTimer(NewInput->m_TargetX, NewInput->m_TargetY);
AfkVoteTimer(NewInput);
if(NewInput->m_PlayerFlags&PLAYERFLAG_CHATTING)
{
@ -525,18 +525,15 @@ bool CPlayer::AfkTimer(int NewTargetX, int NewTargetY)
return false;
}
void CPlayer::AfkVoteTimer(int NewTargetX, int NewTargetY)
void CPlayer::AfkVoteTimer(CNetObj_PlayerInput *NewTarget)
{
if(g_Config.m_SvMaxAfkVoteTime == 0)
return;
if(NewTargetX != m_LastTarget_x || NewTargetY != m_LastTarget_y)
if(mem_comp(NewTarget, &m_LastTarget, sizeof(CNetObj_PlayerInput)) != 0)
{
m_LastPlaytime = time_get();
m_LastTarget_x = NewTargetX;
m_LastTarget_y = NewTargetY;
m_Sent1stAfkWarning = 0; // afk timer's 1st warning after 50% of sv_max_afk_time
m_Sent2ndAfkWarning = 0;
mem_copy(&m_LastTarget, NewTarget, sizeof(CNetObj_PlayerInput));
}
else if(m_LastPlaytime < time_get()-time_freq()*g_Config.m_SvMaxAfkVoteTime)
{

3
src/game/server/player.h
View file

@ -146,11 +146,12 @@ public:
int m_ChatScore;
bool AfkTimer(int new_target_x, int new_target_y); //returns true if kicked
void AfkVoteTimer(int new_target_x, int new_target_y);
void AfkVoteTimer(CNetObj_PlayerInput *NewTarget);
int64 m_LastPlaytime;
int64 m_LastEyeEmote;
int m_LastTarget_x;
int m_LastTarget_y;
CNetObj_PlayerInput m_LastTarget;
int m_Sent1stAfkWarning; // afk timer's 1st warning after 50% of sv_max_afk_time
int m_Sent2ndAfkWarning; // afk timer's 2nd warning after 90% of sv_max_afk_time
char m_pAfkMsg[160];