From 25c71282cf26948001a9d01678f97ccc07ae138e Mon Sep 17 00:00:00 2001 From: "Marius \"Teelevision\" Neugebauer" Date: Wed, 7 May 2014 19:02:55 +0200 Subject: improved spam protection (now you can kill everyone you have on hook) --- src/game/server/entities/character.cpp | 4 +++- src/game/server/entities/projectile.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/game/server/entities') diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 03e409cd..2c1828da 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -489,7 +489,9 @@ void CCharacter::FireWeapon() CNetObj_Projectile p; pProj->FillInfo(&p); - pProj->SetCharactersNearby(); + pProj->InitAffectedCharacters(); + if(m_Core.m_HookedPlayer >= 0) + pProj->SetAffectedCharacter(m_Core.m_HookedPlayer); CMsgPacker Msg(NETMSGTYPE_SV_EXTRAPROJECTILE); Msg.AddInt(1); diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp index d9654a58..3901d50a 100644 --- a/src/game/server/entities/projectile.cpp +++ b/src/game/server/entities/projectile.cpp @@ -73,7 +73,7 @@ void CProjectile::Tick() GameServer()->CreateSound(CurPos, m_SoundImpact); if(m_Explosive) - GameServer()->CreateExplosion(CurPos, m_Owner, m_Weapon, false, m_CharactersNearbyInitialized, m_CharactersNearby); + GameServer()->CreateExplosion(CurPos, m_Owner, m_Weapon, false, m_AffectedCharactersInitialized, m_AffectedCharacters); else if(TargetChr) TargetChr->TakeDamage(m_Direction * max(0.001f, m_Force), m_Damage, m_Owner, m_Weapon); -- cgit 1.4.1