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

Reapply "Only make grenades explode once (fix by timakro)"

Browse source
This commit is contained in:
Dennis Felsing 2018-01-22 14:15:53 +01:00 committed by heinrich5991
parent f3256f0b6c
commit cb0209d6e3
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/server/entities/projectile.cpp
View file

@ -146,6 +146,7 @@ void CProjectile::Tick()
else if (m_Owner >= 0) else if (m_Owner >= 0)
{ {
GameServer()->m_World.DestroyEntity(this); GameServer()->m_World.DestroyEntity(this);
return;
} }
if( ((pTargetChr && (pOwnerChar ? !(pOwnerChar->m_Hit&CCharacter::DISABLE_HIT_GRENADE) : g_Config.m_SvHit || m_Owner == -1 || pTargetChr == pOwnerChar)) || Collide || GameLayerClipped(CurPos)) && !IsWeaponCollide) if( ((pTargetChr && (pOwnerChar ? !(pOwnerChar->m_Hit&CCharacter::DISABLE_HIT_GRENADE) : g_Config.m_SvHit || m_Owner == -1 || pTargetChr == pOwnerChar)) || Collide || GameLayerClipped(CurPos)) && !IsWeaponCollide)
@ -177,10 +178,14 @@ void CProjectile::Tick()
{ {
GameServer()->CreateDamageInd(CurPos, -atan2(m_Direction.x, m_Direction.y), 10, (m_Owner != -1)? TeamMask : -1LL); GameServer()->CreateDamageInd(CurPos, -atan2(m_Direction.x, m_Direction.y), 10, (m_Owner != -1)? TeamMask : -1LL);
GameServer()->m_World.DestroyEntity(this); GameServer()->m_World.DestroyEntity(this);
return;
} }
else else
if (!m_Freeze) if (!m_Freeze)
{
GameServer()->m_World.DestroyEntity(this); GameServer()->m_World.DestroyEntity(this);
return;
}
} }
if(m_LifeSpan == -1) if(m_LifeSpan == -1)
{ {
@ -201,6 +206,7 @@ void CProjectile::Tick()
(m_Owner != -1)? TeamMask : -1LL); (m_Owner != -1)? TeamMask : -1LL);
} }
GameServer()->m_World.DestroyEntity(this); GameServer()->m_World.DestroyEntity(this);
return;
} }
int x = GameServer()->Collision()->GetIndex(PrevPos, CurPos); int x = GameServer()->Collision()->GetIndex(PrevPos, CurPos);