diff options
Diffstat (limited to 'src/server/game/Achievements/CriteriaHandler.cpp')
| -rw-r--r-- | src/server/game/Achievements/CriteriaHandler.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index c3fe055a630..247971b36bd 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -308,17 +308,17 @@ bool CriteriaData::Meets(uint32 criteriaId, Player const* source, WorldObject co case CRITERIA_DATA_TYPE_T_PLAYER_CLASS_RACE: if (!target || target->GetTypeId() != TYPEID_PLAYER) return false; - if (ClassRace.Class && ClassRace.Class != target->ToPlayer()->getClass()) + if (ClassRace.Class && ClassRace.Class != target->ToPlayer()->GetClass()) return false; - if (ClassRace.Race && ClassRace.Race != target->ToPlayer()->getRace()) + if (ClassRace.Race && ClassRace.Race != target->ToPlayer()->GetRace()) return false; return true; case CRITERIA_DATA_TYPE_S_PLAYER_CLASS_RACE: if (source->GetTypeId() != TYPEID_PLAYER) return false; - if (ClassRace.Class && ClassRace.Class != source->ToPlayer()->getClass()) + if (ClassRace.Class && ClassRace.Class != source->ToPlayer()->GetClass()) return false; - if (ClassRace.Race && ClassRace.Race != source->ToPlayer()->getRace()) + if (ClassRace.Race && ClassRace.Race != source->ToPlayer()->GetRace()) return false; return true; case CRITERIA_DATA_TYPE_T_PLAYER_LESS_HEALTH: @@ -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() == Gender.Gender; } case CRITERIA_DATA_TYPE_SCRIPT: { @@ -589,7 +589,7 @@ void CriteriaHandler::UpdateCriteria(CriteriaType type, uint64 miscValue1 /*= 0* SetCriteriaProgress(criteria, miscValue1, referencePlayer, PROGRESS_HIGHEST); break; case CriteriaType::ReachLevel: - SetCriteriaProgress(criteria, referencePlayer->getLevel(), referencePlayer); + SetCriteriaProgress(criteria, referencePlayer->GetLevel(), referencePlayer); break; case CriteriaType::SkillRaised: if (uint32 skillvalue = referencePlayer->GetBaseSkillValue(criteria->Entry->Asset.SkillID)) @@ -1790,15 +1790,15 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 break; } case ModifierTreeType::PlayerToTargetLevelDeltaGreaterThan: // 21 - if (!ref || !ref->IsUnit() || referencePlayer->getLevel() < ref->ToUnit()->getLevel() + reqValue) + if (!ref || !ref->IsUnit() || referencePlayer->GetLevel() < ref->ToUnit()->GetLevel() + reqValue) return false; break; case ModifierTreeType::TargetToPlayerLevelDeltaGreaterThan: // 22 - if (!ref || !ref->IsUnit() || referencePlayer->getLevel() + reqValue < ref->ToUnit()->getLevel()) + if (!ref || !ref->IsUnit() || referencePlayer->GetLevel() + reqValue < ref->ToUnit()->GetLevel()) return false; break; case ModifierTreeType::PlayerLevelEqualTargetLevel: // 23 - if (!ref || !ref->IsUnit() || referencePlayer->getLevel() != ref->ToUnit()->getLevel()) + if (!ref || !ref->IsUnit() || referencePlayer->GetLevel() != ref->ToUnit()->GetLevel()) return false; break; case ModifierTreeType::PlayerInArenaWithTeamSize: // 24 @@ -1809,19 +1809,19 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 break; } case ModifierTreeType::PlayerRace: // 25 - if (referencePlayer->getRace() != reqValue) + if (referencePlayer->GetRace() != reqValue) return false; break; case ModifierTreeType::PlayerClass: // 26 - if (referencePlayer->getClass() != reqValue) + if (referencePlayer->GetClass() != reqValue) return false; break; case ModifierTreeType::TargetRace: // 27 - if (!ref || !ref->IsUnit() || ref->ToUnit()->getRace() != reqValue) + if (!ref || !ref->IsUnit() || ref->ToUnit()->GetRace() != reqValue) return false; break; case ModifierTreeType::TargetClass: // 28 - if (!ref || !ref->IsUnit() || ref->ToUnit()->getClass() != reqValue) + if (!ref || !ref->IsUnit() || ref->ToUnit()->GetClass() != reqValue) return false; break; case ModifierTreeType::LessThanTappers: // 29 @@ -1874,7 +1874,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 return false; break; case ModifierTreeType::PlayerLevelEqual: // 39 - if (referencePlayer->getLevel() != reqValue) + if (referencePlayer->GetLevel() != reqValue) return false; break; case ModifierTreeType::TargetLevelEqual: // 40 @@ -2013,19 +2013,19 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 return false; break; case ModifierTreeType::PlayerLevelEqualOrGreaterThan: // 69 - if (referencePlayer->getLevel() < reqValue) + if (referencePlayer->GetLevel() < reqValue) return false; break; case ModifierTreeType::TargetLevelEqualOrGreaterThan: // 70 - if (!ref || !ref->IsUnit() || ref->ToUnit()->getLevel() < reqValue) + if (!ref || !ref->IsUnit() || ref->ToUnit()->GetLevel() < reqValue) return false; break; case ModifierTreeType::PlayerLevelEqualOrLessThan: // 71 - if (referencePlayer->getLevel() > reqValue) + if (referencePlayer->GetLevel() > reqValue) return false; break; case ModifierTreeType::TargetLevelEqualOrLessThan: // 72 - if (!ref || !ref->IsUnit() || ref->ToUnit()->getLevel() > reqValue) + if (!ref || !ref->IsUnit() || ref->ToUnit()->GetLevel() > reqValue) return false; break; case ModifierTreeType::ModifierTree: // 73 @@ -2166,7 +2166,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 break; } case ModifierTreeType::PlayerGender: // 97 - if (referencePlayer->getGender() != uint8(reqValue)) + if (referencePlayer->GetGender() != uint8(reqValue)) return false; break; case ModifierTreeType::PlayerNativeGender: // 98 @@ -2279,7 +2279,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 break; case ModifierTreeType::PlayerFaction: // 116 { - ChrRacesEntry const* race = sChrRacesStore.LookupEntry(referencePlayer->getRace()); + ChrRacesEntry const* race = sChrRacesStore.LookupEntry(referencePlayer->GetRace()); if (!race) return false; FactionTemplateEntry const* faction = sFactionTemplateStore.LookupEntry(race->FactionID); @@ -3413,7 +3413,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 break; } case ModifierTreeType::PlayerIsAtMaxExpansionLevel: // 264 - if (referencePlayer->getLevel() != GetMaxLevelForExpansion(sWorld->getIntConfig(CONFIG_EXPANSION))) + if (referencePlayer->GetLevel() != GetMaxLevelForExpansion(sWorld->getIntConfig(CONFIG_EXPANSION))) return false; break; case ModifierTreeType::TransmogSource: // 265 @@ -3443,7 +3443,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 return false; case ModifierTreeType::PlayerLevelWithinContentTuning: // 268 { - uint8 level = referencePlayer->getLevel(); + uint8 level = referencePlayer->GetLevel(); if (Optional<ContentTuningLevels> levels = sDB2Manager.GetContentTuningData(reqValue, 0)) { if (secondaryAsset) @@ -3456,7 +3456,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 { if (!ref || !ref->IsUnit()) return false; - uint8 level = ref->ToUnit()->getLevel(); + uint8 level = ref->ToUnit()->GetLevel(); if (Optional<ContentTuningLevels> levels = sDB2Manager.GetContentTuningData(reqValue, 0)) { if (secondaryAsset) @@ -3476,7 +3476,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 } case ModifierTreeType::PlayerLevelWithinOrAboveContentTuning: // 272 { - uint8 level = referencePlayer->getLevel(); + uint8 level = referencePlayer->GetLevel(); if (Optional<ContentTuningLevels> levels = sDB2Manager.GetContentTuningData(reqValue, 0)) return secondaryAsset ? level >= levels->MinLevelWithDelta : level >= levels->MinLevel; return false; @@ -3485,7 +3485,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 { if (!ref || !ref->IsUnit()) return false; - uint8 level = ref->ToUnit()->getLevel(); + uint8 level = ref->ToUnit()->GetLevel(); if (Optional<ContentTuningLevels> levels = sDB2Manager.GetContentTuningData(reqValue, 0)) return secondaryAsset ? level >= levels->MinLevelWithDelta : level >= levels->MinLevel; return false; @@ -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->GetNativeSex(), secondaryAsset); if (!formModelData) return false; uint32 formChoice = referencePlayer->GetCustomizationChoice(formModelData->OptionID); |