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

revert change of dragger range

Browse source
This commit is contained in:
c0d3d3v 2022-05-16 16:24:18 +02:00
parent 8d644d0638
commit 9180fa70e4
No known key found for this signature in database
GPG key ID: 068AF680530DFF31
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/server/entities/dragger.cpp
View file

@ -63,7 +63,8 @@ void CDragger::LookForPlayersToDrag()
CCharacter *pPlayersInRange[MAX_CLIENTS]; CCharacter *pPlayersInRange[MAX_CLIENTS];
mem_zero(pPlayersInRange, sizeof(pPlayersInRange)); mem_zero(pPlayersInRange, sizeof(pPlayersInRange));
int NumPlayersInRange = GameServer()->m_World.FindEntities(m_Pos, g_Config.m_SvDraggerRange, int NumPlayersInRange = GameServer()->m_World.FindEntities(m_Pos,
g_Config.m_SvDraggerRange - CCharacter::ms_PhysSize,
(CEntity **)pPlayersInRange, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER); (CEntity **)pPlayersInRange, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
// The closest player (within range) in a team is selected as the target // The closest player (within range) in a team is selected as the target

3
src/game/server/entities/dragger_beam.cpp
View file

@ -46,8 +46,7 @@ void CDraggerBeam::Tick()
!GameServer()->Collision()->IntersectNoLaser(m_Pos, pTarget->m_Pos, 0, 0); !GameServer()->Collision()->IntersectNoLaser(m_Pos, pTarget->m_Pos, 0, 0);
// This check is necessary because the check in CDragger::LookForPlayersToDrag only happens every 150ms // This check is necessary because the check in CDragger::LookForPlayersToDrag only happens every 150ms
if(!IsReachable || if(!IsReachable ||
distance(pTarget->m_Pos, m_Pos) >= g_Config.m_SvDraggerRange + pTarget->GetProximityRadius() || distance(pTarget->m_Pos, m_Pos) >= g_Config.m_SvDraggerRange || !pTarget->IsAlive())
!pTarget->IsAlive())
{ {
Reset(); Reset();
return; return;