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

Ensure last input send time is reset when disconnecting

Browse source 
Reset send time when disconnecting so input sending should always behave consistently like on the first connection.
This commit is contained in:
Robert Müller 2024-06-02 21:50:41 +02:00
parent a7229e9892
commit b7579b0f0f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/client/components/controls.cpp
View file

@ -35,6 +35,8 @@ void CControls::OnReset()
for(int &AmmoCount : m_aAmmoCount)
AmmoCount = 0;
m_OldMouseX = m_OldMouseY = 0.0f;
m_LastSendTime = 0;
}
void CControls::ResetInput(int Dummy)
@ -188,7 +190,6 @@ void CControls::OnMessage(int Msg, void *pRawMsg)
int CControls::SnapInput(int *pData)
{
static int64_t LastSendTime = 0;
bool Send = false;
// update player state
@ -224,7 +225,7 @@ int CControls::SnapInput(int *pData)
m_aInputData[g_Config.m_ClDummy].m_TargetY = (int)m_aMousePos[g_Config.m_ClDummy].y;
// send once a second just to be sure
if(time_get() > LastSendTime + time_freq())
if(time_get() > m_LastSendTime + time_freq())
Send = true;
}
else
@ -328,7 +329,7 @@ int CControls::SnapInput(int *pData)
Send = true;
// send at at least 10hz
if(time_get() > LastSendTime + time_freq() / 25)
if(time_get() > m_LastSendTime + time_freq() / 25)
Send = true;
if(m_pClient->m_Snap.m_pLocalCharacter && m_pClient->m_Snap.m_pLocalCharacter->m_Weapon == WEAPON_NINJA && (m_aInputData[g_Config.m_ClDummy].m_Direction || m_aInputData[g_Config.m_ClDummy].m_Jump || m_aInputData[g_Config.m_ClDummy].m_Hook))
@ -341,7 +342,7 @@ int CControls::SnapInput(int *pData)
if(!Send)
return 0;
LastSendTime = time_get();
m_LastSendTime = time_get();
mem_copy(pData, &m_aInputData[g_Config.m_ClDummy], sizeof(m_aInputData[0]));
return sizeof(m_aInputData[0]);
}

1
src/game/client/components/controls.h
View file

@ -23,6 +23,7 @@ public:
int m_aAmmoCount[NUM_WEAPONS];
int64_t m_LastSendTime;
CNetObj_PlayerInput m_aInputData[NUM_DUMMIES];
CNetObj_PlayerInput m_aLastData[NUM_DUMMIES];
int m_aInputDirectionLeft[NUM_DUMMIES];