Fixed remaining thread unsafe APState/IPCState reads

Still would like to add some kind of wrapper object that TrackerState could use to read APState without locking, since it'll only ever be called from the thread that would do the mutating, but this is fine for now.

1 files changed, 6 insertions, 0 deletions

@@ -15,6 +15,7 @@
 
 #include <quadtree/Quadtree.h>
 
+#include "ap_state.h"
 #include "game_data.h"
 #include "network_set.h"
 
@@ -50,6 +51,8 @@ class SubwayMap : public wxPanel {
   void SetScrollSpeed(int scroll_x, int scroll_y);
   void SetZoom(double zoom, wxPoint static_point);
 
+  std::optional<int> GetRealSubwayDoor(const SubwayItem subway_item);
+
   wxImage map_image_;
   wxImage owl_image_;
   wxBitmap unchecked_eye_;
@@ -87,6 +90,9 @@ class SubwayMap : public wxPanel {
 
   NetworkSet networks_;
   std::set<std::string> checked_paintings_;
+
+  // Cached from APState.
+  std::map<int, SunwarpMapping> sunwarp_mapping_;
 };
 
 #endif /* end of include guard: SUBWAY_MAP_H_BD2D843E */