Core/Conditions: Make CONDITION_CLASS and CONDITION_RACE use a mask, this will reduce the amount of conditions needed
Signed-off-by: Subv <[email protected]>
This commit is contained in:
@@ -73,10 +73,10 @@ bool Condition::Meets(Player* player, Unit* invoker)
|
|||||||
condMeets = player->GetTeam() == mConditionValue1;
|
condMeets = player->GetTeam() == mConditionValue1;
|
||||||
break;
|
break;
|
||||||
case CONDITION_CLASS:
|
case CONDITION_CLASS:
|
||||||
condMeets = player->getClass() == mConditionValue1;
|
condMeets = player->getClassMask() & mConditionValue1;
|
||||||
break;
|
break;
|
||||||
case CONDITION_RACE:
|
case CONDITION_RACE:
|
||||||
condMeets = player->getRace() == mConditionValue1;
|
condMeets = player->getRaceMask() & mConditionValue1;
|
||||||
break;
|
break;
|
||||||
case CONDITION_SKILL:
|
case CONDITION_SKILL:
|
||||||
condMeets = player->HasSkill(mConditionValue1) && player->GetBaseSkillValue(mConditionValue1) >= mConditionValue2;
|
condMeets = player->HasSkill(mConditionValue1) && player->GetBaseSkillValue(mConditionValue1) >= mConditionValue2;
|
||||||
|
|||||||
Reference in New Issue
Block a user