diff options
| -rwxr-xr-x | src/server/game/Achievements/AchievementMgr.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 3 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 12 | ||||
| -rwxr-xr-x | src/server/game/Maps/ZoneScript.h | 3 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 2d66bcebcc5..83f28b7cbaa 100755 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -901,7 +901,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui continue; uint32 counter =0; - for (RewardedQuestSet::const_iterator itr = GetPlayer()->getRewardedQuests().begin(); itr != GetPlayer()->getRewardedQuests().end(); itr++) + for (RewardedQuestSet::const_iterator itr = GetPlayer()->getRewardedQuests().begin(); itr != GetPlayer()->getRewardedQuests().end(); ++itr) { Quest const* quest = sObjectMgr->GetQuestTemplate(*itr); if (quest && quest->GetZoneOrSort() >= 0 && uint32(quest->GetZoneOrSort()) == achievementCriteria->complete_quests_in_zone.zoneID) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index d5c6023541d..c235c6abd18 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7939,12 +7939,11 @@ void Player::_ApplyWeaponDamage(uint8 slot, ItemTemplate const *proto, ScalingSt float minDamage = proto->Damage[0].DamageMin; float maxDamage = proto->Damage[0].DamageMax; - int32 extraDPS = 0; // If set dpsMod in ScalingStatValue use it for min (70% from average), max (130% from average) damage if (ssv) { - extraDPS = ssv->getDPSMod(proto->ScalingStatValue); + int32 extraDPS = ssv->getDPSMod(proto->ScalingStatValue); if (extraDPS) { float average = extraDPS * proto->Delay / 1000.0f; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 1cf2ee5274f..9113461729a 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5732,15 +5732,15 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (GetTypeId() != TYPEID_PLAYER) return false; - SpellCooldowns const SpellCDs = this->ToPlayer()->GetSpellCooldowns(); + SpellCooldowns const cooldowns = this->ToPlayer()->GetSpellCooldowns(); // remove cooldowns on all ranks of Frost Nova - for (SpellCooldowns::const_iterator itr = SpellCDs.begin(); itr != SpellCDs.end(); itr++) + for (SpellCooldowns::const_iterator itr = cooldowns.begin(); itr != cooldowns.end(); ++itr) { - SpellEntry const* SpellCDs_entry = sSpellStore.LookupEntry(itr->first); + SpellEntry const* cdSpell = sSpellStore.LookupEntry(itr->first); // Frost Nova - if (SpellCDs_entry && SpellCDs_entry->SpellFamilyName == SPELLFAMILY_MAGE - && SpellCDs_entry->SpellFamilyFlags[0] & 0x00000040) - this->ToPlayer()->RemoveSpellCooldown(SpellCDs_entry->Id, true); + if (cdSpell && cdSpell->SpellFamilyName == SPELLFAMILY_MAGE + && cdSpell->SpellFamilyFlags[0] & 0x00000040) + this->ToPlayer()->RemoveSpellCooldown(cdSpell->Id, true); } break; } diff --git a/src/server/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h index e3a0de7f22b..b30e7a97ba6 100755 --- a/src/server/game/Maps/ZoneScript.h +++ b/src/server/game/Maps/ZoneScript.h @@ -28,7 +28,8 @@ class GameObject; class ZoneScript { public: - explicit ZoneScript() {} + ZoneScript() {} + virtual ~ZoneScript() {} virtual uint32 GetCreatureEntry(uint32 /*guidlow*/, CreatureData const* data) { return data->id; } virtual uint32 GetGameObjectEntry(uint32 /*guidlow*/, uint32 entry) { return entry; } |