Core/vmaps: Removed vmap lookup functions duplicating functionality of each other

1 files changed, 13 insertions, 10 deletions

diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MapDefines.h
index 0aa187617df..468d9cee9a6 100644
--- a/src/common/Collision/Maps/MapDefines.h
+++ b/src/common/Collision/Maps/MapDefines.h
@@ -142,23 +142,26 @@ struct LiquidData
     float  depth_level;
 };
 
-struct PositionFullTerrainStatus
+struct WmoLocation
 {
-    struct AreaInfo
-    {
-        AreaInfo(int32 _adtId, int32 _rootId, int32 _groupId, uint32 _flags) : adtId(_adtId), rootId(_rootId), groupId(_groupId), mogpFlags(_flags) { }
-        int32 const adtId;
-        int32 const rootId;
-        int32 const groupId;
-        uint32 const mogpFlags;
-    };
+    WmoLocation() = default;
+    WmoLocation(int32 groupId, int32 nameSetId, int32 rootId, uint32 uniqueId)
+        : GroupId(groupId), NameSetId(nameSetId), RootId(rootId), UniqueId(uniqueId) { }
+
+    int32 GroupId = 0;
+    int32 NameSetId = 0;
+    int32 RootId = 0;
+    uint32 UniqueId = 0;
+};
 
+struct PositionFullTerrainStatus
+{
     PositionFullTerrainStatus() : areaId(0), floorZ(0.0f), outdoors(true), liquidStatus(LIQUID_MAP_NO_WATER) { }
     uint32 areaId;
     float floorZ;
     bool outdoors;
     ZLiquidStatus liquidStatus;
-    Optional<AreaInfo> areaInfo;
+    Optional<WmoLocation> wmoLocation;
     Optional<LiquidData> liquidInfo;
 };