From e3723d38435d7105c284d36e63634947f710c5d6 Mon Sep 17 00:00:00 2001 From: Tater Date: Sat, 1 Jun 2024 22:26:57 -0500 Subject: [PATCH] Change incorrectly named OnClientDirectInput function This has not done any Direct Input since #1441 --- src/engine/server.h | 2 +- src/engine/server/server.cpp | 2 +- src/game/server/gamecontext.cpp | 4 ++-- src/game/server/gamecontext.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/server.h b/src/engine/server.h index 99e034b2e..780b8aaf8 100644 --- a/src/engine/server.h +++ b/src/engine/server.h @@ -330,7 +330,7 @@ public: virtual void OnClientEnter(int ClientId) = 0; virtual void OnClientDrop(int ClientId, const char *pReason) = 0; virtual void OnClientPrepareInput(int ClientId, void *pInput) = 0; - virtual void OnClientDirectInput(int ClientId, void *pInput) = 0; + virtual void OnClientFreshInput(int ClientId, void *pInput) = 0; virtual void OnClientPredictedInput(int ClientId, void *pInput) = 0; virtual void OnClientPredictedEarlyInput(int ClientId, void *pInput) = 0; diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 0cc565031..db10b6452 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -1686,7 +1686,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket) // call the mod with the fresh input data if(m_aClients[ClientId].m_State == CClient::STATE_INGAME) - GameServer()->OnClientDirectInput(ClientId, LatestInput.m_aData); + GameServer()->OnClientFreshInput(ClientId, LatestInput.m_aData); } else if(Msg == NETMSG_RCON_CMD) { diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index c5bb5e458..3a708e1c8 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -1302,8 +1302,8 @@ void CGameContext::OnClientPrepareInput(int ClientId, void *pInput) pPlayerInput->m_PlayerFlags = PlayerFlags_SevenToSix(pPlayerInput->m_PlayerFlags); } -// Called on all incoming NETMSG_INPUT, only sets player flags and tracks afk status. Does not perform a DirectInput -void CGameContext::OnClientDirectInput(int ClientId, void *pInput) +// Called on all incoming NETMSG_INPUT, only sets player flags and tracks afk status. +void CGameContext::OnClientFreshInput(int ClientId, void *pInput) { if(!m_World.m_Paused) m_apPlayers[ClientId]->OnPlayerFreshInput((CNetObj_PlayerInput *)pInput); diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h index d7ae91341..c8428c324 100644 --- a/src/game/server/gamecontext.h +++ b/src/game/server/gamecontext.h @@ -313,7 +313,7 @@ public: void OnClientEnter(int ClientId) override; void OnClientDrop(int ClientId, const char *pReason) override; void OnClientPrepareInput(int ClientId, void *pInput) override; - void OnClientDirectInput(int ClientId, void *pInput) override; + void OnClientFreshInput(int ClientId, void *pInput) override; void OnClientPredictedInput(int ClientId, void *pInput) override; void OnClientPredictedEarlyInput(int ClientId, void *pInput) override;