diff options
author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-07-15 10:22:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-15 10:22:29 +0200 |
commit | 202fd41389973322f63186fd8e5a368fce3e1b04 (patch) | |
tree | 61650c3cf7ec62a142b250a59562063c7ef1d8a5 /src/server/game/Maps/Map.cpp | |
parent | ce1e2c0f9b4f80e1fa5c448ee12fec43204a3634 (diff) |
Core/Misc: Replace boost::optional with std::optional (#25047)
C++17 is already mandatory, so it's a safe thing to do
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rw-r--r-- | src/server/game/Maps/Map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 3b5d31af057..a5dd811e255 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2759,7 +2759,7 @@ void Map::GetFullTerrainStatusForPosition(uint32 phaseMask, float x, float y, fl { if (wmoData->areaInfo) { - data.areaInfo = boost::in_place(wmoData->areaInfo->adtId, wmoData->areaInfo->rootId, wmoData->areaInfo->groupId, wmoData->areaInfo->mogpFlags); + data.areaInfo.emplace(wmoData->areaInfo->adtId, wmoData->areaInfo->rootId, wmoData->areaInfo->groupId, wmoData->areaInfo->mogpFlags); // wmo found WMOAreaTableEntry const* wmoEntry = GetWMOAreaTableEntryByTripple(wmoData->areaInfo->rootId, wmoData->areaInfo->adtId, wmoData->areaInfo->groupId); data.outdoors = (wmoData->areaInfo->mogpFlags & 0x8) != 0; @@ -2820,7 +2820,7 @@ void Map::GetFullTerrainStatusForPosition(uint32 phaseMask, float x, float y, fl } } - data.liquidInfo = boost::in_place(); + data.liquidInfo.emplace(); data.liquidInfo->level = wmoData->liquidInfo->level; data.liquidInfo->depth_level = wmoData->floorZ; data.liquidInfo->entry = liquidType; |