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

Fix physics change by weak hook fix (fixes #5769)

Browse source
This commit is contained in:
fokkonaut 2022-08-24 17:52:31 +02:00 committed by Jupeyy
parent 098cb2b0f2
commit cedc315a70
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/server/entities/character.h
View file

@ -33,7 +33,7 @@ public:
void Reset() override; void Reset() override;
void Destroy() override; void Destroy() override;
void PreTick() override; void PreTick();
void Tick() override; void Tick() override;
void TickDeferred() override; void TickDeferred() override;
void TickPaused() override; void TickPaused() override;

7
src/game/server/entity.h
View file

@ -86,13 +86,6 @@ public: // TODO: Maybe make protected
*/ */
virtual void Reset() {} virtual void Reset() {}
/*
Function: PreTick
Called to progress the entity before the next tick.
Can be used to prepare variables for all clients before the next tick is executed.
*/
virtual void PreTick() {}
/* /*
Function: Tick Function: Tick
Called to progress the entity to the next tick. Updates Called to progress the entity to the next tick. Updates

16
src/game/server/gameworld.cpp
View file

@ -267,25 +267,31 @@ void CGameWorld::Tick()
{ {
if(GameServer()->m_pController->IsForceBalanced()) if(GameServer()->m_pController->IsForceBalanced())
GameServer()->SendChat(-1, CGameContext::CHAT_ALL, "Teams have been balanced"); GameServer()->SendChat(-1, CGameContext::CHAT_ALL, "Teams have been balanced");
// update all objects // update all objects
if(g_Config.m_SvNoWeakHookAndBounce) for(int i = 0; i < NUM_ENTTYPES; i++)
{ {
for(auto *pEnt : m_apFirstEntityTypes) // It's important to call PreTick() and Tick() after each other.
// If we call PreTick() before, and Tick() after other entities have been processed, it causes physics changes such as a stronger shotgun or grenade.
if(g_Config.m_SvNoWeakHookAndBounce && i == ENTTYPE_CHARACTER)
{
auto *pEnt = m_apFirstEntityTypes[i];
for(; pEnt;) for(; pEnt;)
{ {
m_pNextTraverseEntity = pEnt->m_pNextTypeEntity; m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
pEnt->PreTick(); ((CCharacter *)pEnt)->PreTick();
pEnt = m_pNextTraverseEntity; pEnt = m_pNextTraverseEntity;
} }
} }
for(auto *pEnt : m_apFirstEntityTypes) auto *pEnt = m_apFirstEntityTypes[i];
for(; pEnt;) for(; pEnt;)
{ {
m_pNextTraverseEntity = pEnt->m_pNextTypeEntity; m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
pEnt->Tick(); pEnt->Tick();
pEnt = m_pNextTraverseEntity; pEnt = m_pNextTraverseEntity;
} }
}
for(auto *pEnt : m_apFirstEntityTypes) for(auto *pEnt : m_apFirstEntityTypes)
for(; pEnt;) for(; pEnt;)