From a70e758ba5eef1e8aa966cbabaee020630d2c872 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Wed, 6 Mar 2024 00:04:19 +0100
Subject: Tools/vmap_extractor: Move information about model type from spawns
 in vmap tiles to model file itself

---
 src/tools/vmap4_assembler/TileAssembler.h | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'src/tools/vmap4_assembler/TileAssembler.h')

diff --git a/src/tools/vmap4_assembler/TileAssembler.h b/src/tools/vmap4_assembler/TileAssembler.h
index 73b58941de4..b2ec8fd73b5 100644
--- a/src/tools/vmap4_assembler/TileAssembler.h
+++ b/src/tools/vmap4_assembler/TileAssembler.h
@@ -20,7 +20,6 @@
 
 #include <G3D/Vector3.h>
 #include <G3D/Matrix3.h>
-#include <compare>
 #include <deque>
 #include <map>
 #include <set>
@@ -53,25 +52,12 @@ namespace VMAP
             void moveToBasePos(const G3D::Vector3& pBasePos) { iPos -= pBasePos; }
     };
 
-    struct TileSpawn
-    {
-        TileSpawn() : Id(0), Flags(0) { }
-        TileSpawn(uint32 id, uint32 flags) : Id(id), Flags(flags) { }
-
-        uint32 Id;
-        uint32 Flags;
-
-        std::strong_ordering operator<=>(TileSpawn const& right) const { return Id <=> right.Id; }
-    };
-
     struct MapSpawns
     {
-        MapSpawns() { }
-
-        uint32 MapId;
+        uint32 MapId = 0;
         std::map<uint32, ModelSpawn> UniqueEntries;
-        std::map<uint32 /*packedTileId*/, std::set<TileSpawn>> TileEntries;
-        std::map<uint32 /*packedTileId*/, std::set<TileSpawn>> ParentTileEntries;
+        std::map<uint32 /*packedTileId*/, std::set<uint32 /*Id*/>> TileEntries;
+        std::map<uint32 /*packedTileId*/, std::set<uint32 /*Id*/>> ParentTileEntries;
     };
 
     typedef std::deque<MapSpawns> MapData;
@@ -97,6 +83,7 @@ namespace VMAP
 
     struct WorldModel_Raw
     {
+        ModelFlags Flags;
         uint32 RootWMOID;
         std::vector<GroupModel_Raw> groupsArray;
 
-- 
cgit v1.2.3