diff options
| author | Shereef Marzouk <GreYFoXGTi@Gmail.cim> | 2011-08-02 12:35:14 +0200 |
|---|---|---|
| committer | Shereef Marzouk <GreYFoXGTi@Gmail.cim> | 2011-08-02 12:35:14 +0200 |
| commit | 8877cf229301f868edb425131035b5a7db2adcf6 (patch) | |
| tree | eb260ba6f85e46164a46ea3f674fb09246c6ac7f /src/game/server | |
| parent | 2b5c532589b225431ad1dc02212e274c25493a17 (diff) | |
| download | zcatch-8877cf229301f868edb425131035b5a7db2adcf6.tar.gz zcatch-8877cf229301f868edb425131035b5a7db2adcf6.zip | |
Refactored some pointers
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/entities/laser.cpp | 8 |
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; } |