diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Collision/Management/IVMapManager.h | 2 | ||||
| -rw-r--r-- | src/common/Collision/Management/VMapManager2.cpp | 2 | ||||
| -rw-r--r-- | src/common/Debugging/WheatyExceptionReport.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h index 0371135cfa5..c32bb2d41e5 100644 --- a/src/common/Collision/Management/IVMapManager.h +++ b/src/common/Collision/Management/IVMapManager.h @@ -66,7 +66,7 @@ namespace VMAP uint32 const type; float const level; }; - + float floorZ = VMAP_INVALID_HEIGHT; Optional<AreaInfo> areaInfo; Optional<LiquidInfo> liquidInfo; diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index 7c894efa1ca..8140a66c61c 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -303,7 +303,7 @@ namespace VMAP if (!reqLiquidType || (GetLiquidFlagsPtr(liquidType) & reqLiquidType)) if (info.hitInstance->GetLiquidLevel(pos, info, liquidLevel)) data.liquidInfo = boost::in_place(liquidType, liquidLevel); - + if (!IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_AREAFLAG)) data.areaInfo = boost::in_place(info.hitInstance->adtId, info.rootId, info.hitModel->GetWmoID(), info.hitModel->GetMogpFlags()); } diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 8211f4d6151..e818df4e8fb 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -827,7 +827,7 @@ PVOID UserContext) { ClearSymbols(); FormatSymbolValue(pSymInfo, (STACKFRAME64*)UserContext); - + } __except (EXCEPTION_EXECUTE_HANDLER) { |
