diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index eab78dd6d77..5ad1751f0a2 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -3713,7 +3713,7 @@ void ObjectMgr::LoadPetLevelInfo() auto& pInfoMapEntry = _petInfoStore[creature_id]; if (!pInfoMapEntry) - pInfoMapEntry = Trinity::make_unique<PetLevelInfo[]>(sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); + pInfoMapEntry = std::make_unique<PetLevelInfo[]>(sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); // data for level 1 stored in [0] array element, ... PetLevelInfo* pLevelInfo = &pInfoMapEntry[current_level - 1]; @@ -3871,7 +3871,7 @@ void ObjectMgr::LoadPlayerInfo() continue; } - std::unique_ptr<PlayerInfo> info = Trinity::make_unique<PlayerInfo>(); + std::unique_ptr<PlayerInfo> info = std::make_unique<PlayerInfo>(); info->mapId = mapId; info->areaId = areaId; info->positionX = positionX; @@ -4235,8 +4235,8 @@ void ObjectMgr::LoadPlayerInfo() auto& info = _playerClassInfo[current_class]; if (!info) { - info = Trinity::make_unique<PlayerClassInfo>(); - info->levelInfo = Trinity::make_unique<PlayerClassLevelInfo[]>(sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); + info = std::make_unique<PlayerClassInfo>(); + info->levelInfo = std::make_unique<PlayerClassLevelInfo[]>(sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); } PlayerClassLevelInfo& levelInfo = info->levelInfo[current_level - 1]; @@ -4327,7 +4327,7 @@ void ObjectMgr::LoadPlayerInfo() if (auto& info = _playerInfo[current_race][current_class]) { if (!info->levelInfo) - info->levelInfo = Trinity::make_unique<PlayerLevelInfo[]>(sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); + info->levelInfo = std::make_unique<PlayerLevelInfo[]>(sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); PlayerLevelInfo& levelInfo = info->levelInfo[current_level - 1]; for (uint8 i = 0; i < MAX_STATS; ++i) @@ -6091,7 +6091,7 @@ void ObjectMgr::LoadInstanceEncounters() } DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR32(dungeonEncounter->mapId, dungeonEncounter->difficulty)]; - encounters.emplace_back(Trinity::make_unique<DungeonEncounter>(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon)); + encounters.emplace_back(std::make_unique<DungeonEncounter>(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon)); ++count; } while (result->NextRow()); @@ -7169,7 +7169,7 @@ void ObjectMgr::LoadAccessRequirements() uint32 requirement_ID = MAKE_PAIR32(mapid, difficulty); auto& ar = _accessRequirementStore[requirement_ID]; - ar = Trinity::make_unique<AccessRequirement>(); + ar = std::make_unique<AccessRequirement>(); ar->levelMin = fields[2].GetUInt8(); ar->levelMax = fields[3].GetUInt8(); |