Proper painting reachability detection

1 files changed, 9 insertions, 7 deletions

@@ -66,8 +66,9 @@ void AreaPopup::UpdateIndicators() {
   }
 
   if (AP_IsPaintingShuffle()) {
-    for (const PaintingExit& painting : map_area.paintings) {
-      wxSize item_extent = mem_dc.GetTextExtent(painting.id);
+    for (int painting_id : map_area.paintings) {
+      const PaintingExit& painting = GD_GetPaintingExit(painting_id);
+      wxSize item_extent = mem_dc.GetTextExtent(painting.internal_id);  // TODO: Replace with a friendly name.
       int item_height = std::max(32, item_extent.GetHeight()) + 10;
       acc_height += item_height;
 
@@ -123,18 +124,19 @@ void AreaPopup::UpdateIndicators() {
   }
 
   if (AP_IsPaintingShuffle()) {
-    for (const PaintingExit& painting : map_area.paintings) {
-      bool checked = AP_IsPaintingChecked(painting.id);
+    for (int painting_id : map_area.paintings) {
+      const PaintingExit& painting = GD_GetPaintingExit(painting_id);
+      bool checked = AP_IsPaintingChecked(painting.internal_id);
       wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
 
       mem_dc.DrawBitmap(*eye_ptr, {10, cur_height});
 
-      bool reachable = painting.door ? IsDoorOpen(*painting.door) : true;
+      bool reachable = IsPaintingReachable(painting_id);
       const wxColour* text_color = reachable ? wxWHITE : wxRED;
       mem_dc.SetTextForeground(*text_color);
 
-      wxSize item_extent = mem_dc.GetTextExtent(painting.id);
-      mem_dc.DrawText(painting.id,
+      wxSize item_extent = mem_dc.GetTextExtent(painting.internal_id);  // TODO: Replace with friendly name.
+      mem_dc.DrawText(painting.internal_id,
                       {10 + 32 + 10,
                        cur_height + (32 - mem_dc.GetFontMetrics().height) / 2});