Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-09 03:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Replace boost::optional with std::optional (#25047)

Browse Source 
C++17 is already mandatory, so it's a safe thing to do

(cherry picked from commit 202fd41389)
This commit is contained in:
Peter Keresztes Schmidt
2020-07-15 10:22:29 +02:00
committed by Shauren
parent cd86a015c4
commit 770fbcca0c
15 changed files with 35 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/Collision/DynamicTree.cpp
View File

@@ -295,9 +295,9 @@ void DynamicMapTree::getAreaAndLiquidData(float x, float y, float z, PhaseShift
float liquidLevel;
if (!reqLiquidType || (dynamic_cast<VMAP::VMapManager2*>(VMAP::VMapFactory::createOrGetVMapManager())->GetLiquidFlagsPtr(liquidType) & reqLiquidType))
if (intersectionCallBack.GetHitModel()->GetLiquidLevel(v, intersectionCallBack.GetLocationInfo(), liquidLevel))
data.liquidInfo = boost::in_place(liquidType, liquidLevel);
data.liquidInfo.emplace(liquidType, liquidLevel);
data.areaInfo = boost::in_place(intersectionCallBack.GetHitModel()->GetNameSetId(),
data.areaInfo.emplace(intersectionCallBack.GetHitModel()->GetNameSetId(),
intersectionCallBack.GetLocationInfo().rootId,
intersectionCallBack.GetLocationInfo().hitModel->GetWmoID(),
intersectionCallBack.GetLocationInfo().hitModel->GetMogpFlags());