diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-08-20 14:36:26 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-12 16:27:20 +0100 |
| commit | 3a62ecb5160e9d564204f5070270227b10be5e35 (patch) | |
| tree | 91cf865565ddddcc7eed788c6e29b63ca13b5f95 /src | |
| parent | 238072e67a5287be39a2bbd2961a28bf7801db22 (diff) | |
Core/Conditions: Add new CONDITION_TAXI (46). Does what it says on the tin. Tagging issue #15560.
(cherry picked from commit 08b383305146962f686af716c90f10776a12bc12)
Diffstat (limited to 'src')
| -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 0629a5b1f5d..621d48112f2 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -108,7 +108,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 @@ -477,6 +478,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; @@ -667,6 +674,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; @@ -2287,6 +2297,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 01382599ceb..cb8fb3e8a08 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -94,7 +94,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: |