From c3106d027414ca73a106df6894bb6a30b3a296ce Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 24 Jul 2024 14:23:08 -0400
Subject: Fixed subway squares for shuffled sunwarps showing unshuffled access

---
 src/subway_map.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/subway_map.cpp b/src/subway_map.cpp
index e7ac317..5b3ff5f 100644
--- a/src/subway_map.cpp
+++ b/src/subway_map.cpp
@@ -563,6 +563,7 @@ void SubwayMap::Redraw() {
     ItemDrawType draw_type = ItemDrawType::kNone;
     const wxBrush *brush_color = wxGREY_BRUSH;
     std::optional<wxColour> shade_color;
+    std::optional<int> subway_door = GetRealSubwayDoor(subway_item);
 
     if (AP_HasEarlyColorHallways() &&
         subway_item.special == "starting_room_paintings") {
@@ -624,10 +625,10 @@ void SubwayMap::Redraw() {
       } else if (!subway_item.tags.empty()) {
         draw_type = ItemDrawType::kOwl;
       }
-    } else if (subway_item.door) {
+    } else if (subway_door) {
       draw_type = ItemDrawType::kBox;
 
-      if (IsDoorOpen(*subway_item.door)) {
+      if (IsDoorOpen(*subway_door)) {
         brush_color = wxGREEN_BRUSH;
       } else {
         brush_color = wxRED_BRUSH;
-- 
cgit 1.4.1