about summary refs log tree commit diff
path: root/src/game/server/entities
diff options
context:
space:
mode:
authoroy <tom_adams@web.de>2011-08-03 13:50:48 -0700
committeroy <tom_adams@web.de>2011-08-03 13:50:48 -0700
commit558f62f8107192c90696bf59d12c92ffcd176685 (patch)
treeeb260ba6f85e46164a46ea3f674fb09246c6ac7f /src/game/server/entities
parent50edfd37c0ed57ff793b79d06edd0bde1f6cf1bd (diff)
parent8877cf229301f868edb425131035b5a7db2adcf6 (diff)
downloadzcatch-558f62f8107192c90696bf59d12c92ffcd176685.tar.gz
zcatch-558f62f8107192c90696bf59d12c92ffcd176685.zip
Merge pull request #813 from GreYFoX/oypull
Minor and not important changes, but useful
Diffstat (limited to 'src/game/server/entities')
-rw-r--r--src/game/server/entities/laser.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp
index af66fe0c..7278995f 100644
--- a/src/game/server/entities/laser.cpp
+++ b/src/game/server/entities/laser.cpp
@@ -21,15 +21,15 @@ CLaser::CLaser(CGameWorld *pGameWorld, vec2 Pos, vec2 Direction, float StartEner
 bool CLaser::HitCharacter(vec2 From, vec2 To)
 {
 	vec2 At;
-	CCharacter *OwnerChar = GameServer()->GetPlayerChar(m_Owner);
-	CCharacter *Hit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, OwnerChar);
-	if(!Hit)
+	CCharacter *pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
+	CCharacter *pHit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, pOwnerChar);
+	if(!pHit)
 		return false;
 
 	m_From = From;
 	m_Pos = At;
 	m_Energy = -1;
-	Hit->TakeDamage(vec2(0.f, 0.f), GameServer()->Tuning()->m_LaserDamage, m_Owner, WEAPON_RIFLE);
+	pHit->TakeDamage(vec2(0.f, 0.f), GameServer()->Tuning()->m_LaserDamage, m_Owner, WEAPON_RIFLE);
 	return true;
 }