Store map names in json, instead of ID

Author: SydMontague

src/MAP.cpp

@@ -411,7 +411,16 @@ void MAPExporter::saveObject(MapObject& obj, TIMPalette& pal, std::filesystem::p
 bool MAPExporter::save(std::filesystem::path outputDir)
 {
     // write JSON
-    std::ofstream(outputDir / "map.json") << map.to_json().dump(2);
+    auto json = map.to_json();
+    for (int i = 0; i < 10; i++)
+    {
+        auto& val = json["elements"]["warp"][std::to_string(i)]["map"];
+        if (val < mapEntries.size())
+            val = mapEntries[val].data.name;
+        else
+            val = "";
+    }
+    std::ofstream(outputDir / "map.json") << json.dump(2);
 
     // write background images
     auto images = tfs.getImages(map);

src/MAP.hpp

@@ -237,13 +237,15 @@ class MAPExporter
     TFSFile tfs;
     MapEntry mapEntry;
     std::map<uint32_t, Model> doors;
+    std::array<MapEntry, 255> mapEntries;
 
 public:
-    MAPExporter(MapFile map, TFSFile tfs, MapEntry mapEntry, std::map<uint32_t, Model> doors)
+    MAPExporter(MapFile map, TFSFile tfs, MapEntry mapEntry, std::map<uint32_t, Model> doors, std::array<MapEntry, 255> mapEntries)
         : map(map)
         , tfs(tfs)
         , mapEntry(mapEntry)
         , doors(doors)
+        , mapEntries(mapEntries)
     {
     }
 

src/main.cpp

@@ -299,7 +299,7 @@ void exportMaps(std::filesystem::path dataPath, std::filesystem::path outputPath
             }
         }
 
-        MAPExporter exporter(map, tfs, entry, doors);
+        MAPExporter exporter(map, tfs, entry, doors, entries);
 
         bool success = exporter.save(outputDir);
         if (success)