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

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

Browse source 
This reverts commit b9a93a18fb.
This commit is contained in:
Dennis Felsing 2018-01-24 07:50:15 +01:00
parent dd7281ef86
commit f3256f0b6c
1 changed files with 0 additions and 6 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,7 +146,6 @@ 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)
@ -178,14 +177,10 @@ 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)
{ {
@ -206,7 +201,6 @@ 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);