diff options
| author | Shauren <shauren.trinity@gmail.com> | 2021-12-21 18:29:52 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-21 18:29:52 +0100 |
| commit | 2c78f4dd1f52200e7061b809bb472dbcd499962e (patch) | |
| tree | 14a87d6d9eff90ea9e0e298eb532241da0fcc804 /src/server/game/Entities | |
| parent | 6229a6ddc11be7409646a8ac99a5ecaf1b8d37d9 (diff) | |
Core/Misc: Resolve c++17 TODOs left in code as comments
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 2481de2880f..5ebae457a1d 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1449,7 +1449,7 @@ uint8 GameObject::GetLevelForTarget(WorldObject const* target) const { if (Player const* player = target->ToPlayer()) if (Optional<ContentTuningLevels> userLevels = sDB2Manager.GetContentTuningData(GetGOInfo()->ContentTuningId, player->m_playerData->CtrOptions->ContentTuningConditionMask)) - return uint8(advstd::clamp<int16>(player->GetLevel(), userLevels->MinLevel, userLevels->MaxLevel)); + return uint8(std::clamp<int16>(player->GetLevel(), userLevels->MinLevel, userLevels->MaxLevel)); if (Unit const* targetUnit = target->ToUnit()) return targetUnit->GetLevel(); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 49a087f09aa..973cd882b9c 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17051,7 +17051,7 @@ void Player::UpdateQuestObjectiveProgress(QuestObjectiveType objectiveType, int3 int32 currentProgress = GetQuestSlotObjectiveData(logSlot, objective); if (addCount > 0 ? (currentProgress < objective.Amount) : (currentProgress > 0)) { - int32 newProgress = advstd::clamp<int32>(currentProgress + addCount, 0, objective.Amount); + int32 newProgress = std::clamp<int32>(currentProgress + addCount, 0, objective.Amount); SetQuestObjectiveData(objective, newProgress); if (addCount > 0 && !(objective.Flags & QUEST_OBJECTIVE_FLAG_HIDE_CREDIT_MSG)) { |