diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2019-07-02 12:17:03 +0400 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-13 00:42:20 +0100 |
| commit | 27886c7f5d6cfc221ea67aab210f96859d725e05 (patch) | |
| tree | 6502c70a3ac0b2d3cc5b80f00001e0db37f9bf2b /src/server/game/Achievements/CriteriaHandler.cpp | |
| parent | 4e6c59dca78ce563c327ea3106d0ff6786b1e127 (diff) | |
Core/Player: add helper methods GetNativeGender/SetNativeGender/SetGender (#23520)
* Core/Player: add helper methods GetNativeGender/SetNativeGender/SetGender and fix some cases, where we should get player gender, instead of modified by display gender
* fix merge
* Add virtual methods for Unit class
(cherry picked from commit b47bb59e2a3e42aff3793517ef94f51678b54905)
Diffstat (limited to 'src/server/game/Achievements/CriteriaHandler.cpp')
| -rw-r--r-- | src/server/game/Achievements/CriteriaHandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index 247971b36bd..e9a7a36c684 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -349,7 +349,7 @@ bool CriteriaData::Meets(uint32 criteriaId, Player const* source, WorldObject co Unit const* unitTarget = target->ToUnit(); if (!unitTarget) return false; - return unitTarget->GetGender() == Gender.Gender; + return unitTarget->GetGender() == static_cast<::Gender>(Gender.Gender); } case CRITERIA_DATA_TYPE_SCRIPT: { @@ -2170,7 +2170,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 return false; break; case ModifierTreeType::PlayerNativeGender: // 98 - if (referencePlayer->GetNativeSex() != uint8(reqValue)) + if (referencePlayer->GetNativeGender() != uint8(reqValue)) return false; break; case ModifierTreeType::PlayerSkillEqualOrGreaterThan: // 99 @@ -3649,7 +3649,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 return false; case ModifierTreeType::PlayerSpellShapeshiftFormCreatureDisplayInfoSelection: // 308 { - ShapeshiftFormModelData const* formModelData = sDB2Manager.GetShapeshiftFormModelData(referencePlayer->GetRace(), referencePlayer->GetNativeSex(), secondaryAsset); + ShapeshiftFormModelData const* formModelData = sDB2Manager.GetShapeshiftFormModelData(referencePlayer->GetRace(), referencePlayer->GetNativeGender(), secondaryAsset); if (!formModelData) return false; uint32 formChoice = referencePlayer->GetCustomizationChoice(formModelData->OptionID); |