diff options
| author | Machiavelli <none@none> | 2010-10-02 22:24:02 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2010-10-02 22:24:02 +0200 |
| commit | 27e2a9892078c5157415bf73bd0c53fedec56024 (patch) | |
| tree | 3079ddc2ee8edccf6dd0d3d7fd0e58b28673d329 /src | |
| parent | b90c5d67607891ab227c4f2421e93a677dcb7a80 (diff) | |
Core/Conditions: Drop hacky/nonworking CONDITION_AD_COMMISSION_AURA (10). Condition data with this condition type needs to use CONDITION_AURA (1) to function properly.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 567653f2be7..ce159d7d72e 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -98,18 +98,6 @@ bool Condition::Meets(Player * player, Unit* invoker) condMeets = (status == QUEST_STATUS_NONE); break; } - case CONDITION_AD_COMMISSION_AURA: - { - Unit::AuraApplicationMap const& auras = player->GetAppliedAuras(); - for (Unit::AuraApplicationMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) - if ((itr->second->GetBase()->GetSpellProto()->Attributes & (SPELL_ATTR_UNK4 | SPELL_ATTR_CASTABLE_WHILE_MOUNTED)) && itr->second->GetBase()->GetSpellProto()->SpellVisual[0] == 3580) - { - condMeets = true; - break; - } - condMeets = false; - break; - } case CONDITION_NO_AURA: condMeets = !player->HasAuraEffect(mConditionValue1, mConditionValue2); break; diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 1ac19ddf8c6..a4068fef025 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -39,7 +39,7 @@ enum ConditionType CONDITION_SKILL = 7, // skill_id skill_value +referenceID true if has skill_value for skill_id CONDITION_QUESTREWARDED = 8, // quest_id 0 +referenceID true if quest_id was rewarded before CONDITION_QUESTTAKEN = 9, // quest_id 0, +referenceID true while quest active - CONDITION_AD_COMMISSION_AURA = 10, // 0 0, +referenceID true while one from AD commission aura active + CONDITION_UNUSED_1 = 10, // currently unused CONDITION_NO_AURA = 11, // spell_id effindex +referenceID true if does not have aura of spell_id with effect effindex CONDITION_ACTIVE_EVENT = 12, // event_id 0 +referenceID true if event is active CONDITION_INSTANCE_DATA = 13, // entry data +referenceID true if data is set in current instance |