about summary refs log tree commit diff
path: root/src/game/server/entities
diff options
context:
space:
mode:
authorMarius "Teelevision" Neugebauer <marius@teele.eu>2014-03-28 00:33:40 +0100
committerMarius "Teelevision" Neugebauer <marius@teele.eu>2014-03-28 00:33:40 +0100
commit9e266f4c1dafdba5b562e46bba3eca9dfddb95f3 (patch)
tree103759bae45803af69b6c04ea816b3e9080b7aa2 /src/game/server/entities
parent814138ac95e0f46702c02aba4bef722e08f903d3 (diff)
downloadzcatch-9e266f4c1dafdba5b562e46bba3eca9dfddb95f3.tar.gz
zcatch-9e266f4c1dafdba5b562e46bba3eca9dfddb95f3.zip
anti-spray protection for some cases
Diffstat (limited to 'src/game/server/entities')
-rw-r--r--src/game/server/entities/character.cpp2
-rw-r--r--src/game/server/entities/projectile.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index d7da2498..ee6b1019 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -416,6 +416,8 @@ void CCharacter::FireWeapon()
 			// pack the Projectile and send it to the client Directly
 			CNetObj_Projectile p;
 			pProj->FillInfo(&p);
+			
+			pProj->SetCharactersNearby();
 
 			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 e89e0e6f..d9654a58 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);
+			GameServer()->CreateExplosion(CurPos, m_Owner, m_Weapon, false, m_CharactersNearbyInitialized, m_CharactersNearby);
 
 		else if(TargetChr)
 			TargetChr->TakeDamage(m_Direction * max(0.001f, m_Force), m_Damage, m_Owner, m_Weapon);