1 files changed, 26 insertions, 7 deletions

@@ -284,7 +284,7 @@ struct GameData {
                               .as<int>();
           } else {
             wxLogError("Missing AP location ID for panel %s - %s",
-                         rooms_[room_id].name, panels_[panel_id].name);
+                       rooms_[room_id].name, panels_[panel_id].name);
           }
         }
       }
@@ -348,7 +348,7 @@ struct GameData {
                                 .as<int>();
             } else {
               wxLogError("Missing AP item ID for door %s - %s",
-                           rooms_[room_id].name, doors_[door_id].name);
+                         rooms_[room_id].name, doors_[door_id].name);
             }
           }
 
@@ -422,7 +422,8 @@ struct GameData {
           std::string painting_id = painting["id"].as<std::string>();
           room_by_painting_[painting_id] = room_id;
 
-          if (!painting["exit_only"] || !painting["exit_only"].as<bool>()) {
+          if ((!painting["exit_only"] || !painting["exit_only"].as<bool>()) &&
+              (!painting["disable"] || !painting["disable"].as<bool>())) {
             PaintingExit painting_exit;
             painting_exit.id = painting_id;
 
@@ -594,11 +595,28 @@ struct GameData {
       }
     }
 
+    for (const Room &room : rooms_) {
+      std::string area_name = room.name;
+      if (fold_areas.count(room.name)) {
+        int fold_area_id = fold_areas[room.name];
+        area_name = map_areas_[fold_area_id].name;
+      }
+
+      if (!room.paintings.empty()) {
+        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);
+        }
+      }
+    }
+
     // Report errors.
     for (const std::string &area : malconfigured_areas_) {
       wxLogError("Area data not found for: %s", area);
     }
-    
+
     // Read in subway items.
     YAML::Node subway_config =
         YAML::LoadFile(GetAbsolutePath("assets/subway.yaml"));
@@ -687,7 +705,8 @@ struct GameData {
     if (!door_by_id_.count(full_name)) {
       int door_id = doors_.size();
       door_by_id_[full_name] = doors_.size();
-      doors_.push_back({.id = door_id, .room = AddOrGetRoom(room), .name = door});
+      doors_.push_back(
+          {.id = door_id, .room = AddOrGetRoom(room), .name = door});
     }
 
     return door_by_id_[full_name];
@@ -728,7 +747,7 @@ GameData &GetState() {
 
 }  // namespace
 
-bool SubwaySunwarp::operator<(const SubwaySunwarp& rhs) const {
+bool SubwaySunwarp::operator<(const SubwaySunwarp &rhs) const {
   return std::tie(dots, type) < std::tie(rhs.dots, rhs.type);
 }
 
@@ -782,7 +801,7 @@ const SubwayItem &GD_GetSubwayItem(int id) {
   return GetState().subway_items_.at(id);
 }
 
-int GD_GetSubwayItemForPainting(const std::string& painting_id) {
+int GD_GetSubwayItemForPainting(const std::string &painting_id) {
 #ifndef NDEBUG
   if (!GetState().subway_item_by_painting_.count(painting_id)) {
     wxLogError("No subway item for painting %s", painting_id);