1 files changed, 25 insertions, 9 deletions

@@ -48,11 +48,13 @@ struct GameData {
   std::vector<Panel> panels_;
   std::vector<MapArea> map_areas_;
   std::vector<SubwayItem> subway_items_;
+  std::vector<PaintingExit> paintings_;
 
   std::map<std::string, int> room_by_id_;
   std::map<std::string, int> door_by_id_;
   std::map<std::string, int> panel_by_id_;
   std::map<std::string, int> area_by_id_;
+  std::map<std::string, int> painting_by_id_;
 
   std::vector<int> door_definition_order_;
 
@@ -419,13 +421,13 @@ struct GameData {
 
       if (room_it.second["paintings"]) {
         for (const auto &painting : room_it.second["paintings"]) {
-          std::string painting_id = painting["id"].as<std::string>();
-          room_by_painting_[painting_id] = room_id;
+          std::string internal_id = painting["id"].as<std::string>();
 
           if ((!painting["exit_only"] || !painting["exit_only"].as<bool>()) &&
               (!painting["disable"] || !painting["disable"].as<bool>())) {
-            PaintingExit painting_exit;
-            painting_exit.id = painting_id;
+            int painting_id = AddOrGetPainting(internal_id);
+            PaintingExit &painting_exit = paintings_[painting_id];
+            painting_exit.room = room_id;
 
             if (painting["required_door"]) {
               std::string rd_room = rooms_[room_id].name;
@@ -437,7 +439,7 @@ struct GameData {
                   rd_room, painting["required_door"]["door"].as<std::string>());
             }
 
-            rooms_[room_id].paintings.push_back(painting_exit);
+            rooms_[room_id].paintings.push_back(painting_exit.id);
           }
         }
       }
@@ -606,8 +608,8 @@ struct GameData {
         int area_id = AddOrGetArea(area_name);
         MapArea &map_area = map_areas_[area_id];
 
-        for (const PaintingExit &painting : room.paintings) {
-          map_area.paintings.push_back(painting);
+        for (int painting_id : room.paintings) {
+          map_area.paintings.push_back(painting_id);
         }
       }
     }
@@ -738,6 +740,16 @@ struct GameData {
 
     return area_by_id_[area];
   }
+
+  int AddOrGetPainting(std::string internal_id) {
+    if (!painting_by_id_.count(internal_id)) {
+      int painting_id = paintings_.size();
+      painting_by_id_[internal_id] = painting_id;
+      paintings_.push_back({.id = painting_id, .internal_id = internal_id});
+    }
+
+    return painting_by_id_[internal_id];
+  }
 };
 
 GameData &GetState() {
@@ -773,8 +785,12 @@ const Panel &GD_GetPanel(int panel_id) {
   return GetState().panels_.at(panel_id);
 }
 
-int GD_GetRoomForPainting(const std::string &painting_id) {
-  return GetState().room_by_painting_.at(painting_id);
+const PaintingExit &GD_GetPaintingExit(int painting_id) {
+  return GetState().paintings_.at(painting_id);
+}
+
+int GD_GetPaintingByName(const std::string &name) {
+  return GetState().painting_by_id_.at(name);
 }
 
 const std::vector<int> &GD_GetAchievementPanels() {