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

More accurate ping estimation in the scoreboard

Browse source
This commit is contained in:
Redix 2018-11-11 19:04:19 +01:00
parent bff4f2d9cd
commit 77924b4254
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -387,6 +387,12 @@ void CClient::DirectInput(int *pInput, int Size)
for(int i = 0; i < Size/4; i++) for(int i = 0; i < Size/4; i++)
Msg.AddInt(pInput[i]); Msg.AddInt(pInput[i]);
int PingCorrection = 0;
int64 TagTime;
if(m_SnapshotStorage.Get(m_AckGameTick, &TagTime, 0, 0) >= 0)
PingCorrection = (int)(((time_get()-TagTime)*1000)/time_freq());
Msg.AddInt(PingCorrection);
SendMsg(&Msg, 0); SendMsg(&Msg, 0);
} }
@ -418,6 +424,12 @@ void CClient::SendInput()
for(int i = 0; i < Size/4; i++) for(int i = 0; i < Size/4; i++)
Msg.AddInt(m_aInputs[m_CurrentInput].m_aData[i]); Msg.AddInt(m_aInputs[m_CurrentInput].m_aData[i]);
int PingCorrection = 0;
int64 TagTime;
if(m_SnapshotStorage.Get(m_AckGameTick, &TagTime, 0, 0) >= 0)
PingCorrection = (int)(((Now-TagTime)*1000)/time_freq());
Msg.AddInt(PingCorrection);
m_CurrentInput++; m_CurrentInput++;
m_CurrentInput%=200; m_CurrentInput%=200;

13
src/engine/server/server.cpp
View file

@ -886,6 +886,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
{ {
CClient::CInput *pInput; CClient::CInput *pInput;
int64 TagTime; int64 TagTime;
int64 Now = time_get();
m_aClients[ClientID].m_LastAckedSnapshot = Unpacker.GetInt(); m_aClients[ClientID].m_LastAckedSnapshot = Unpacker.GetInt();
int IntendedTick = Unpacker.GetInt(); int IntendedTick = Unpacker.GetInt();
@ -898,14 +899,11 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
if(m_aClients[ClientID].m_LastAckedSnapshot > 0) if(m_aClients[ClientID].m_LastAckedSnapshot > 0)
m_aClients[ClientID].m_SnapRate = CClient::SNAPRATE_FULL; m_aClients[ClientID].m_SnapRate = CClient::SNAPRATE_FULL;
if(m_aClients[ClientID].m_Snapshots.Get(m_aClients[ClientID].m_LastAckedSnapshot, &TagTime, 0, 0) >= 0)
m_aClients[ClientID].m_Latency = (int)(((time_get()-TagTime)*1000)/time_freq());
// add message to report the input timing // add message to report the input timing
// skip packets that are old // skip packets that are old
if(IntendedTick > m_aClients[ClientID].m_LastInputTick) if(IntendedTick > m_aClients[ClientID].m_LastInputTick)
{ {
int TimeLeft = ((TickStartTime(IntendedTick)-time_get())*1000) / time_freq(); int TimeLeft = ((TickStartTime(IntendedTick)-Now)*1000) / time_freq();
CMsgPacker Msg(NETMSG_INPUTTIMING, true); CMsgPacker Msg(NETMSG_INPUTTIMING, true);
Msg.AddInt(IntendedTick); Msg.AddInt(IntendedTick);
@ -925,6 +923,13 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
for(int i = 0; i < Size/4; i++) for(int i = 0; i < Size/4; i++)
pInput->m_aData[i] = Unpacker.GetInt(); pInput->m_aData[i] = Unpacker.GetInt();
int PingCorrection = clamp(Unpacker.GetInt(), 0, 50);
if(m_aClients[ClientID].m_Snapshots.Get(m_aClients[ClientID].m_LastAckedSnapshot, &TagTime, 0, 0) >= 0)
{
m_aClients[ClientID].m_Latency = (int)(((Now-TagTime)*1000)/time_freq());
m_aClients[ClientID].m_Latency = max(0, m_aClients[ClientID].m_Latency - PingCorrection);
}
mem_copy(m_aClients[ClientID].m_LatestInput.m_aData, pInput->m_aData, MAX_INPUT_SIZE*sizeof(int)); mem_copy(m_aClients[ClientID].m_LatestInput.m_aData, pInput->m_aData, MAX_INPUT_SIZE*sizeof(int));
m_aClients[ClientID].m_CurrentInput++; m_aClients[ClientID].m_CurrentInput++;