diff options
| author | Machiavelli <none@none> | 2009-06-10 19:41:53 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-10 19:41:53 +0200 |
| commit | 7445ddad0520fd9a55234a0c22dca56e4e7c00d0 (patch) | |
| tree | e28cc60fd95bc9c8c8cb0812089301fc3c484dce /src/game/Wintergrasp.cpp | |
| parent | b0fa2172e3df7bd098df5f6144d8231e1d98c4d9 (diff) | |
Minor code cleanup:
* Fix possible crash in OPvPCapturePoint::AddCapturePoint due to using null pointer in log output
* Correct damage for Gore (arithmetic operator has precedence over question operator)
* Correct SQL query that WaypointManager uses to count record number
* Declare Aura *aur in OPvPWintergrasp::HandleKill only once and then evaluate value instead of declaring twice and then evaluating
--HG--
branch : trunk
Diffstat (limited to 'src/game/Wintergrasp.cpp')
| -rw-r--r-- | src/game/Wintergrasp.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp index 2d76559a1c0..4cc447f72b3 100644 --- a/src/game/Wintergrasp.cpp +++ b/src/game/Wintergrasp.cpp @@ -363,7 +363,8 @@ void OPvPWintergrasp::HandleKill(Player *killer, Unit *victim) // We handle promotion here because player should not get promotion if he has buff but do the kill outside the zone if(victim->getLevel() >= 70) { - if(Aura *aur = killer->GetAura(SPELL_RECRUIT)) + Aura *aur; + if(aur = killer->GetAura(SPELL_RECRUIT)) { if(aur->GetStackAmount() >= 5) { @@ -373,7 +374,7 @@ void OPvPWintergrasp::HandleKill(Player *killer, Unit *victim) else killer->CastSpell(killer, SPELL_RECRUIT, true); } - else if(Aura *aur = killer->GetAura(SPELL_CORPORAL)) + else if(aur = killer->GetAura(SPELL_CORPORAL)) { if(aur->GetStackAmount() >= 5) { |