diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-10-04 18:47:58 +0200 |
|---|---|---|
| committer | SnapperRy <snapperryen@gmail.com> | 2016-10-04 18:47:58 +0200 |
| commit | fd620ca7d620f72276e00be3906da145bdd4a9fd (patch) | |
| tree | 0d25b5e34e371efc330a73b19e2afca6af002f2e /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | c22d3886ce9e29941376885b3d814690453a254c (diff) | |
Core/Conditions: partially revert 723c253, replacing CONDITION_WINTERGRASP_HORDE with a ConditionScript.
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 8c557ff2907..c859031b573 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -18,7 +18,6 @@ #include "ConditionMgr.h" #include "AchievementMgr.h" -#include "BattlefieldMgr.h" #include "GameEventMgr.h" #include "InstanceScript.h" #include "ObjectMgr.h" @@ -110,8 +109,7 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND { "Charmed", false, false, false }, { "Pet type", true, false, false }, { "On Taxi", false, false, false }, - { "Quest state mask", true, true, false }, - { "Wintergrasp is horde",false, false, false } + { "Quest state mask", true, true, false } }; // Checks if object meets the condition @@ -496,16 +494,6 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const } break; } - case CONDITION_WINTERGRASP_HORDE: - { - condMeets = false; - if (object->GetTypeId() == TYPEID_PLAYER) - if (Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG)) - if (wintergrasp->IsEnabled()) - if (wintergrasp->GetDefenderTeam() == TEAM_HORDE) - condMeets = true; - break; - } default: condMeets = false; break; @@ -694,9 +682,6 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const case CONDITION_QUESTSTATE: mask |= GRID_MAP_TYPE_MASK_PLAYER; break; - case CONDITION_WINTERGRASP_HORDE: - mask |= GRID_MAP_TYPE_MASK_PLAYER; - break; default: ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!"); break; @@ -2237,7 +2222,6 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const case CONDITION_IN_WATER: case CONDITION_CHARMED: case CONDITION_TAXI: - case CONDITION_WINTERGRASP_HORDE: default: break; } |