diff options
author | Subv2112 <s.v.h21@hotmail.com> | 2012-01-28 12:25:44 -0500 |
---|---|---|
committer | Subv2112 <s.v.h21@hotmail.com> | 2012-01-28 12:25:44 -0500 |
commit | ff81a2455b9dc9afb4e3875a02899fc52b0a510f (patch) | |
tree | d2ad05e92a088222a3a3c442c3d8fd21d8e9d602 | |
parent | eeb35df7665ee2b462a99faf5950b0a2de366b0c (diff) |
Core/Conditions: Make CONDITION_CLASS and CONDITION_RACE use a mask, this will reduce the amount of conditions needed
Signed-off-by: Subv <s.v.h21@hotmail.com>
-rwxr-xr-x | src/server/game/Conditions/ConditionMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 49b5d4cba65..9b045a8ed6a 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -73,10 +73,10 @@ bool Condition::Meets(Player* player, Unit* invoker) condMeets = player->GetTeam() == mConditionValue1; break; case CONDITION_CLASS: - condMeets = player->getClass() == mConditionValue1; + condMeets = player->getClassMask() & mConditionValue1; break; case CONDITION_RACE: - condMeets = player->getRace() == mConditionValue1; + condMeets = player->getRaceMask() & mConditionValue1; break; case CONDITION_SKILL: condMeets = player->HasSkill(mConditionValue1) && player->GetBaseSkillValue(mConditionValue1) >= mConditionValue2; |