diff options
| author | Shocker <none@none> | 2010-09-28 08:21:51 +0300 |
|---|---|---|
| committer | Shocker <none@none> | 2010-09-28 08:21:51 +0300 |
| commit | 78803c9f09feff5213a394a84e28b8245f7e2efa (patch) | |
| tree | 7e58d15fabfb5f3ebbe7364ad6424f548caacf24 /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | 192e972a594afb020e6639de7cce617e7f4655ad (diff) | |
Magic numbers cleanup:
- Replace many magic numbers with constants
- Use enum for vehicle flags/seat flags
- Correct structure for ItemRandomSuffixEntry
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 41fe265161d..ea4f49767f9 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -102,7 +102,7 @@ bool Condition::Meets(Player * player, Unit* invoker) { Unit::AuraApplicationMap const& auras = player->GetAppliedAuras(); for (Unit::AuraApplicationMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) - if ((itr->second->GetBase()->GetSpellProto()->Attributes & 0x1000010) && itr->second->GetBase()->GetSpellProto()->SpellVisual[0] == 3580) + if ((itr->second->GetBase()->GetSpellProto()->Attributes & (SPELL_ATTR_UNK4 | SPELL_ATTR_CASTABLE_WHILE_MOUNTED)) && itr->second->GetBase()->GetSpellProto()->SpellVisual[0] == 3580) { condMeets = true; break; @@ -792,7 +792,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) } bool targetfound = false; - for (uint8 i = 0; i < 3; ++i) + for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if (spellProto->EffectImplicitTargetA[i] == TARGET_UNIT_AREA_ENTRY_SRC || spellProto->EffectImplicitTargetB[i] == TARGET_UNIT_AREA_ENTRY_SRC || @@ -875,7 +875,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) if (!conditions.empty()) break; - for (int j = 0; j < 3; ++j) + for (int j = 0; j < MAX_SPELL_EFFECTS; ++j) { if (pSpellInfo->EffectImplicitTargetA[j] == TARGET_UNIT_TARGET_ENEMY || pSpellInfo->EffectImplicitTargetB[j] == TARGET_UNIT_TARGET_ENEMY || |