diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-07-15 10:22:29 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 18:05:59 +0100 |
| commit | 770fbcca0cae18faac981a326d73996afc20b9ba (patch) | |
| tree | 2e173ff2e397e56975cb37a10ec11119ec3af41f /src/common/Collision/DynamicTree.cpp | |
| parent | cd86a015c46f8da581f86857e313d9c596dba7fa (diff) | |
Core/Misc: Replace boost::optional with std::optional (#25047)
C++17 is already mandatory, so it's a safe thing to do
(cherry picked from commit 202fd41389973322f63186fd8e5a368fce3e1b04)
Diffstat (limited to 'src/common/Collision/DynamicTree.cpp')
| -rw-r--r-- | src/common/Collision/DynamicTree.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index 3d8ca49a4fe..bd7034bbb6c 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -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()); |