3 files changed, 12 insertions, 10 deletions

@@ -839,13 +839,11 @@ const SubwayItem &GD_GetSubwayItem(int id) {
   return GetState().subway_items_.at(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);
+std::optional<int> GD_GetSubwayItemForPainting(const std::string &painting_id) {
+  if (GetState().subway_item_by_painting_.count(painting_id)) {
+    return GetState().subway_item_by_painting_.at(painting_id);
   }
-#endif
-  return GetState().subway_item_by_painting_.at(painting_id);
+  return std::nullopt;
 }
 
 int GD_GetSubwayItemForSunwarp(const SubwaySunwarp &sunwarp) {
@@ -164,7 +164,7 @@ const std::vector<int>& GD_GetSunwarpDoors();
 int GD_GetRoomForSunwarp(int index);
 const std::vector<SubwayItem>& GD_GetSubwayItems();
 const SubwayItem& GD_GetSubwayItem(int id);
-int GD_GetSubwayItemForPainting(const std::string& painting_id);
+std::optional<int> GD_GetSubwayItemForPainting(const std::string& painting_id);
 int GD_GetSubwayItemForSunwarp(const SubwaySunwarp& sunwarp);
 
 #endif /* end of include guard: GAME_DATA_H_9C42AC51 */
@@ -147,9 +147,13 @@ void SubwayMap::UpdateIndicators() {
         checked_paintings_.insert(painting_id);
 
         if (AP_GetPaintingMapping().count(painting_id)) {
-          networks_.AddLink(GD_GetSubwayItemForPainting(painting_id),
-                            GD_GetSubwayItemForPainting(
-                                AP_GetPaintingMapping().at(painting_id)));
+          std::optional<int> from_id = GD_GetSubwayItemForPainting(painting_id);
+          std::optional<int> to_id = GD_GetSubwayItemForPainting(
+              AP_GetPaintingMapping().at(painting_id));
+
+          if (from_id && to_id) {
+            networks_.AddLink(*from_id, *to_id);
+          }
         }
       }
     }