From 5064e8a2ae223d9b4e4a8fa7f2c63a3fde76eecf Mon Sep 17 00:00:00 2001 From: Tater Date: Sun, 2 Jun 2024 04:15:28 -0500 Subject: [PATCH] Remove CurrentInput, LatestInput from debug dummy, fix shadow --- src/engine/server/server.cpp | 2 -- src/game/server/gameworld.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 885dc631e0a..dea15951663 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -2652,8 +2652,6 @@ void CServer::UpdateDebugDummies(bool ForceDisconnect) Input.m_Direction = (ClientId & 1) ? -1 : 1; m_aClients[ClientId].m_aInputs[0].m_GameTick = Tick() + 1; mem_copy(m_aClients[ClientId].m_aInputs[0].m_aData, &Input, minimum(sizeof(Input), sizeof(m_aClients[ClientId].m_aInputs[0].m_aData))); - m_aClients[ClientId].m_LatestInput = m_aClients[ClientId].m_aInputs[0]; - m_aClients[ClientId].m_CurrentInput = 0; } } diff --git a/src/game/server/gameworld.cpp b/src/game/server/gameworld.cpp index 5c7d8fa1630..7a511c9ebd0 100644 --- a/src/game/server/gameworld.cpp +++ b/src/game/server/gameworld.cpp @@ -215,12 +215,12 @@ void CGameWorld::Tick() GameServer()->SendChat(-1, TEAM_ALL, "Teams have been balanced"); // This is placed here so that certain weapon physics can happen before the regular Charecter Tick() to preserve physics accuracy - auto *pEnt = m_apFirstEntityTypes[ENTTYPE_CHARACTER]; - for(; pEnt;) + auto *pChar = m_apFirstEntityTypes[ENTTYPE_CHARACTER]; + for(; pChar;) { - m_pNextTraverseEntity = pEnt->m_pNextTypeEntity; - ((CCharacter *)pEnt)->WeaponTick(); - pEnt = m_pNextTraverseEntity; + m_pNextTraverseEntity = pChar->m_pNextTypeEntity; + ((CCharacter *)pChar)->WeaponTick(); + pChar = m_pNextTraverseEntity; } // update all objects