diff options
| author | megamage <none@none> | 2009-04-07 16:24:14 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-07 16:24:14 -0500 |
| commit | 24dede78d339f348ab67d4e7235ed12d93802b69 (patch) | |
| tree | 8b7dbd1f4dec392beea68984bf0657925a3199b6 /src | |
| parent | d2301bdf9a5056afeac2d48e0079a52599b69165 (diff) | |
[7621] More strong check for 23922 and ranks for add damage Author: Lutik
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/DBCEnums.h | 6 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h index c3139dc2a37..078804c19f4 100644 --- a/src/game/DBCEnums.h +++ b/src/game/DBCEnums.h @@ -45,9 +45,9 @@ enum AchievementFlags ACHIEVEMENT_FLAG_COUNTER = 0x00000001, // Just count statistic (never stop and complete) ACHIEVEMENT_FLAG_UNK2 = 0x00000002, // not used ACHIEVEMENT_FLAG_STORE_MAX_VALUE = 0x00000004, // Store only max value? used only in "Reach level xx" - ACHIEVEMENT_FLAG_SUMM = 0x00000008, // Use summ criteria value from all reqirements (and calculate max vale) - ACHIEVEMENT_FLAG_MAX_USED = 0x00000010, // Show max criteria (and calculate max vale ??) - ACHIEVEMENT_FLAG_REQ_COUNT = 0x00000020, // Use not zero req count (and calculate max vale) + ACHIEVEMENT_FLAG_SUMM = 0x00000008, // Use summ criteria value from all reqirements (and calculate max value) + ACHIEVEMENT_FLAG_MAX_USED = 0x00000010, // Show max criteria (and calculate max value ??) + ACHIEVEMENT_FLAG_REQ_COUNT = 0x00000020, // Use not zero req count (and calculate max value) ACHIEVEMENT_FLAG_AVERANGE = 0x00000040, // Show as averange value (value / time_in_days) depend from other flag (by def use last criteria value) ACHIEVEMENT_FLAG_BAR = 0x00000080, // Show as progress bar (value / max vale) depend from other flag (by def use last criteria value) ACHIEVEMENT_FLAG_REALM_FIRST_REACH = 0x00000100, // diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 4e1af29d4aa..51469804114 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -402,7 +402,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100); } // Shield Slam - else if(m_spellInfo->SpellFamilyFlags[1] & 0x200) + else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category==1209) damage += int32(m_caster->GetShieldBlockValue()); // Victory Rush else if(m_spellInfo->SpellFamilyFlags[1] & 0x100) |