diff options
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 13 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 2629013585a..a31d73b6dfb 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -107,7 +107,8 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND { "Sit/stand state", true, true, false }, { "Daily Quest Completed",true, false, false }, { "Charmed", false, false, false }, - { "Pet type", true, false, false } + { "Pet type", true, false, false }, + { "On Taxi", false, false, false } }; // Checks if object meets the condition @@ -471,6 +472,12 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const condMeets = (((1 << pet->getPetType()) & ConditionValue1) != 0); break; } + case CONDITION_TAXI: + { + if (Player* player = object->ToPlayer()) + condMeets = player->IsInFlight(); + break; + } default: condMeets = false; break; @@ -653,6 +660,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const case CONDITION_PET_TYPE: mask |= GRID_MAP_TYPE_MASK_PLAYER; break; + case CONDITION_TAXI: + mask |= GRID_MAP_TYPE_MASK_PLAYER; + break; default: ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!"); break; @@ -2185,6 +2195,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const break; case CONDITION_IN_WATER: case CONDITION_CHARMED: + case CONDITION_TAXI: default: break; } diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 659cec02d37..f4068842765 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -76,7 +76,8 @@ enum ConditionTypes CONDITION_DAILY_QUEST_DONE = 43, // quest id 0 0 true if daily quest has been completed for the day CONDITION_CHARMED = 44, // 0 0 0 true if unit is currently charmed CONDITION_PET_TYPE = 45, // mask 0 0 true if player has a pet of given type(s) - CONDITION_MAX = 46 // MAX + CONDITION_TAXI = 46, // 0 0 0 true if player is on taxi + CONDITION_MAX = 47 // MAX }; /*! Documentation on implementing a new ConditionSourceType: |