From 45ee989c70682c001d4467d97bf1ecedcf7dbcc3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 7 Mar 2024 00:23:52 +0100 Subject: Core/vmaps: Removed vmap lookup functions duplicating functionality of each other --- src/server/game/Maps/Map.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/server/game/Maps/Map.cpp') diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index a1f6b1d4a67..b722717a86a 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1680,22 +1680,17 @@ void Map::UnloadAll() } void Map::GetFullTerrainStatusForPosition(PhaseShift const& phaseShift, float x, float y, float z, PositionFullTerrainStatus& data, - map_liquidHeaderTypeFlags reqLiquidType, float collisionHeight) + Optional reqLiquidType, float collisionHeight) { m_terrain->GetFullTerrainStatusForPosition(phaseShift, GetId(), x, y, z, data, reqLiquidType, collisionHeight, &_dynamicTree); } -ZLiquidStatus Map::GetLiquidStatus(PhaseShift const& phaseShift, float x, float y, float z, map_liquidHeaderTypeFlags ReqLiquidType, LiquidData* data, +ZLiquidStatus Map::GetLiquidStatus(PhaseShift const& phaseShift, float x, float y, float z, Optional ReqLiquidType, LiquidData* data, float collisionHeight) { return m_terrain->GetLiquidStatus(phaseShift, GetId(), x, y, z, ReqLiquidType, data, collisionHeight); } -bool Map::GetAreaInfo(PhaseShift const& phaseShift, float x, float y, float z, uint32& mogpflags, int32& adtId, int32& rootId, int32& groupId) -{ - return m_terrain->GetAreaInfo(phaseShift, GetId(), x, y, z, mogpflags, adtId, rootId, groupId, &_dynamicTree); -} - uint32 Map::GetAreaId(PhaseShift const& phaseShift, float x, float y, float z) { return m_terrain->GetAreaId(phaseShift, GetId(), x, y, z, &_dynamicTree); -- cgit v1.2.3