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

Remove dead code and obsolete TODO

Browse source 
It seems unlikely we that would want to introduce a variable to tweak the hook behavior at this point, so the TODO is removed.
This commit is contained in:
Robert Müller 2024-07-09 22:02:06 +02:00
parent 8e83049054
commit aeee2f561d
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/game/gamecore.cpp
View file

@ -332,8 +332,6 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
int teleNr = 0; int teleNr = 0;
int Hit = m_pCollision->IntersectLineTeleHook(m_HookPos, NewPos, &NewPos, 0, &teleNr); int Hit = m_pCollision->IntersectLineTeleHook(m_HookPos, NewPos, &NewPos, 0, &teleNr);
// m_NewHook = false;
if(Hit) if(Hit)
{ {
if(Hit == TILE_NOHOOK) if(Hit == TILE_NOHOOK)
@ -418,10 +416,6 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
m_HookState = HOOK_RETRACTED; m_HookState = HOOK_RETRACTED;
m_HookPos = m_Pos; m_HookPos = m_Pos;
} }
// keep players hooked for a max of 1.5sec
// if(Server()->Tick() > hook_tick+(Server()->TickSpeed()*3)/2)
// release_hooked();
} }
// don't do this hook routine when we are already hooked to a player // don't do this hook routine when we are already hooked to a player
@ -471,9 +465,6 @@ void CCharacterCore::TickDeferred()
if(!pCharCore) if(!pCharCore)
continue; continue;
// player *p = (player*)ent;
// if(pCharCore == this) // || !(p->flags&FLAG_ALIVE)
if(pCharCore == this || (m_Id != -1 && !m_pTeams->CanCollide(m_Id, i))) if(pCharCore == this || (m_Id != -1 && !m_pTeams->CanCollide(m_Id, i)))
continue; // make sure that we don't nudge our self continue; // make sure that we don't nudge our self
@ -505,7 +496,7 @@ void CCharacterCore::TickDeferred()
// handle hook influence // handle hook influence
if(!m_HookHitDisabled && m_HookedPlayer == i && m_Tuning.m_PlayerHooking) if(!m_HookHitDisabled && m_HookedPlayer == i && m_Tuning.m_PlayerHooking)
{ {
if(Distance > PhysicalSize() * 1.50f) // TODO: fix tweakable variable if(Distance > PhysicalSize() * 1.50f)
{ {
float HookAccel = m_Tuning.m_HookDragAccel * (Distance / m_Tuning.m_HookLength); float HookAccel = m_Tuning.m_HookDragAccel * (Distance / m_Tuning.m_HookLength);
float DragSpeed = m_Tuning.m_HookDragSpeed; float DragSpeed = m_Tuning.m_HookDragSpeed;

1
src/game/gamecore.h
View file

@ -120,7 +120,6 @@ enum
COREEVENT_HOOK_ATTACH_GROUND = 0x10, COREEVENT_HOOK_ATTACH_GROUND = 0x10,
COREEVENT_HOOK_HIT_NOHOOK = 0x20, COREEVENT_HOOK_HIT_NOHOOK = 0x20,
COREEVENT_HOOK_RETRACT = 0x40, COREEVENT_HOOK_RETRACT = 0x40,
// COREEVENT_HOOK_TELE=0x80,
}; };
// show others values - do not change them // show others values - do not change them