From 0411e6a73b09186b4b1c361cf24d7c10ebc6bedc Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 15 May 2011 00:01:58 +0200 Subject: Core/Stats: Fixed compile warning --- src/server/game/Entities/Unit/StatSystem.cpp | 66 ++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 4cba669f805..5989b191005 100755 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -298,9 +298,15 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) switch (getClass()) { - case CLASS_HUNTER: val2 = level * 2.0f + GetStat(STAT_AGILITY) - 10.0f; break; - case CLASS_ROGUE: val2 = level + GetStat(STAT_AGILITY) - 10.0f; break; - case CLASS_WARRIOR:val2 = level + GetStat(STAT_AGILITY) - 10.0f; break; + case CLASS_HUNTER: + val2 = level * 2.0f + GetStat(STAT_AGILITY) - 10.0f; + break; + case CLASS_ROGUE: + val2 = level + GetStat(STAT_AGILITY) - 10.0f; + break; + case CLASS_WARRIOR: + val2 = level + GetStat(STAT_AGILITY) - 10.0f; + break; case CLASS_DRUID: switch (GetShapeshiftForm()) { @@ -319,12 +325,24 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) { switch (getClass()) { - case CLASS_WARRIOR: val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f; break; - case CLASS_PALADIN: val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f; break; - case CLASS_DEATH_KNIGHT: val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f; break; - case CLASS_ROGUE: val2 = level * 2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f; break; - case CLASS_HUNTER: val2 = level * 2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f; break; - case CLASS_SHAMAN: val2 = level * 2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f; break; + case CLASS_WARRIOR: + val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f; + break; + case CLASS_PALADIN: + val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f; + break; + case CLASS_DEATH_KNIGHT: + val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f; + break; + case CLASS_ROGUE: + val2 = level * 2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f; + break; + case CLASS_HUNTER: + val2 = level * 2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f; + break; + case CLASS_SHAMAN: + val2 = level * 2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f; + break; case CLASS_DRUID: { // Check if Predatory Strikes is skilled @@ -344,14 +362,14 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) mLevelMult = CalculatePctN(1.0f, aurEff->GetAmount()); break; case 1: // Predatory Strikes (effect 1) - if (m_items[EQUIPMENT_SLOT_MAINHAND]) + if (Item* mainHand = m_items[EQUIPMENT_SLOT_MAINHAND]) { // also gains % attack power from equipped weapon - ItemTemplate const *proto = m_items[EQUIPMENT_SLOT_MAINHAND]->GetTemplate(); + ItemTemplate const *proto = mainHand->GetTemplate(); if (!proto) continue; - weapon_bonus = CalculatePctN(proto->getFeralBonus(), aurEff->GetAmount()); + weapon_bonus = CalculatePctN(float(proto->getFeralBonus()), aurEff->GetAmount()); } break; default: @@ -364,20 +382,30 @@ void Player::UpdateAttackPowerAndDamage(bool ranged) switch (GetShapeshiftForm()) { case FORM_CAT: - val2 = getLevel() * (mLevelMult + 2.0f) + GetStat(STAT_STRENGTH) * 2.0f + GetStat(STAT_AGILITY) - 20.0f + weapon_bonus + m_baseFeralAP; break; + val2 = getLevel() * (mLevelMult + 2.0f) + GetStat(STAT_STRENGTH) * 2.0f + GetStat(STAT_AGILITY) - 20.0f + weapon_bonus + m_baseFeralAP; + break; case FORM_BEAR: case FORM_DIREBEAR: - val2 = getLevel() * (mLevelMult + 3.0f) + GetStat(STAT_STRENGTH) * 2.0f - 20.0f + weapon_bonus + m_baseFeralAP; break; + val2 = getLevel() * (mLevelMult + 3.0f) + GetStat(STAT_STRENGTH) * 2.0f - 20.0f + weapon_bonus + m_baseFeralAP; + break; case FORM_MOONKIN: - val2 = getLevel() * (mLevelMult + 1.5f) + GetStat(STAT_STRENGTH) * 2.0f - 20.0f + m_baseFeralAP; break; + val2 = getLevel() * (mLevelMult + 1.5f) + GetStat(STAT_STRENGTH) * 2.0f - 20.0f + m_baseFeralAP; + break; default: - val2 = GetStat(STAT_STRENGTH) * 2.0f - 20.0f; break; + val2 = GetStat(STAT_STRENGTH) * 2.0f - 20.0f; + break; } break; } - case CLASS_MAGE: val2 = GetStat(STAT_STRENGTH) - 10.0f; break; - case CLASS_PRIEST: val2 = GetStat(STAT_STRENGTH) - 10.0f; break; - case CLASS_WARLOCK: val2 = GetStat(STAT_STRENGTH) - 10.0f; break; + case CLASS_MAGE: + val2 = GetStat(STAT_STRENGTH) - 10.0f; + break; + case CLASS_PRIEST: + val2 = GetStat(STAT_STRENGTH) - 10.0f; + break; + case CLASS_WARLOCK: + val2 = GetStat(STAT_STRENGTH) - 10.0f; + break; } } -- cgit v1.2.3