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 | |
| 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')
| -rw-r--r-- | src/game/OutdoorPvP.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 2 | ||||
| -rw-r--r-- | src/game/WaypointManager.cpp | 2 | ||||
| -rw-r--r-- | src/game/Wintergrasp.cpp | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp index c1e3c84e6f7..fd1cf87e6d6 100644 --- a/src/game/OutdoorPvP.cpp +++ b/src/game/OutdoorPvP.cpp @@ -80,7 +80,7 @@ bool OPvPCapturePoint::AddCapturePoint(uint32 entry, uint32 map, float x, float GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(entry); if(!goinfo || goinfo->type != GAMEOBJECT_TYPE_CAPTURE_POINT) { - sLog.outError("OutdoorPvP: GO %u is not capture point!", goinfo->id); + sLog.outError("OutdoorPvP: GO %u is not capture point!", entry); return false; } diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index ae84b6c4ff9..8d6d0bc7ae8 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -321,7 +321,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) //Gore if(m_spellInfo->SpellIconID == 2269 ) { - damage+= rand()%2 ? damage : 0; + damage += (rand()%2 ? damage : 0); } // Meteor like spells (divided damage to targets) diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp index 26be14d89fa..382f70a19ad 100644 --- a/src/game/WaypointManager.cpp +++ b/src/game/WaypointManager.cpp @@ -34,7 +34,7 @@ void WaypointStore::Free() void WaypointStore::Load() { - QueryResult *result = WorldDatabase.PQuery("SELECT MAX(`id`) FROM `waypoint_data`"); + QueryResult *result = WorldDatabase.PQuery("SELECT COUNT(`id`) FROM `waypoint_data`"); if(!result) { sLog.outError("an error occured while loading the table `waypoint_data` (maybe it doesn't exist ?)"); 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) { |