Fixed broken paintings and window repainting

2 files changed, 11 insertions, 6 deletions

@@ -427,12 +427,13 @@ struct GameData {
       if (room_it.second["paintings"]) {
         for (const auto &painting : room_it.second["paintings"]) {
           std::string internal_id = painting["id"].as<std::string>();
+          int painting_id = AddOrGetPainting(internal_id);
+          PaintingExit &painting_exit = paintings_[painting_id];
+          painting_exit.room = room_id;
 
           if ((!painting["exit_only"] || !painting["exit_only"].as<bool>()) &&
               (!painting["disable"] || !painting["disable"].as<bool>())) {
-            int painting_id = AddOrGetPainting(internal_id);
-            PaintingExit &painting_exit = paintings_[painting_id];
-            painting_exit.room = room_id;
+            painting_exit.entrance = true;
 
             if (painting["required_door"]) {
               std::string rd_room = rooms_[room_id].name;
@@ -443,9 +444,9 @@ struct GameData {
               painting_exit.door = AddOrGetDoor(
                   rd_room, painting["required_door"]["door"].as<std::string>());
             }
-
-            rooms_[room_id].paintings.push_back(painting_exit.id);
           }
+
+          rooms_[room_id].paintings.push_back(painting_exit.id);
         }
       }
 
@@ -627,7 +628,10 @@ struct GameData {
         MapArea &map_area = map_areas_[area_id];
 
         for (int painting_id : room.paintings) {
-          map_area.paintings.push_back(painting_id);
+          const PaintingExit &painting_obj = paintings_.at(painting_id);
+          if (painting_obj.entrance) {
+            map_area.paintings.push_back(painting_id);
+          }
         }
       }
     }
@@ -92,6 +92,7 @@ struct PaintingExit {
   int room;
   std::string internal_id;
   std::optional<int> door;
+  bool entrance = false;
 };
 
 struct Room {