Merge branch 'subway'

1 files changed, 22 insertions, 2 deletions

@@ -1,5 +1,7 @@
 #include "tracker_panel.h"
 
+#include <wx/dcbuffer.h>
+
 #include "ap_state.h"
 #include "area_popup.h"
 #include "game_data.h"
@@ -13,6 +15,8 @@ constexpr int AREA_EFFECTIVE_SIZE = AREA_ACTUAL_SIZE + AREA_BORDER_SIZE * 2;
 constexpr int PLAYER_SIZE = 96;
 
 TrackerPanel::TrackerPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
+  SetBackgroundStyle(wxBG_STYLE_PAINT);
+
   map_image_ = wxImage(GetAbsolutePath("assets/lingo_map.png").c_str(),
                        wxBITMAP_TYPE_PNG);
   if (!map_image_.IsOk()) {
@@ -54,7 +58,7 @@ void TrackerPanel::OnPaint(wxPaintEvent &event) {
     Redraw();
   }
 
-  wxPaintDC dc(this);
+  wxBufferedPaintDC dc(this);
   dc.DrawBitmap(rendered_, 0, 0);
 
   if (AP_GetPlayerPosition().has_value()) {
@@ -139,7 +143,8 @@ void TrackerPanel::Redraw() {
   for (AreaIndicator &area : areas_) {
     const MapArea &map_area = GD_GetMapArea(area.area_id);
     if (!AP_IsLocationVisible(map_area.classification) &&
-        !(map_area.hunt && GetTrackerConfig().show_hunt_panels)) {
+        !(map_area.hunt && GetTrackerConfig().show_hunt_panels) &&
+        !(AP_IsPaintingShuffle() && !map_area.paintings.empty())) {
       area.active = false;
       continue;
     } else {
@@ -167,6 +172,21 @@ void TrackerPanel::Redraw() {
       }
     }
 
+    if (AP_IsPaintingShuffle()) {
+      for (int painting_id : map_area.paintings) {
+        const PaintingExit &painting = GD_GetPaintingExit(painting_id);
+        if (!AP_IsPaintingChecked(painting.internal_id)) {
+          bool reachable = IsPaintingReachable(painting_id);
+
+          if (reachable) {
+            has_reachable_unchecked = true;
+          } else {
+            has_unreachable_unchecked = true;
+          }
+        }
+      }
+    }
+
     int real_area_x = final_x + (map_area.map_x - (AREA_EFFECTIVE_SIZE / 2)) *
                                     final_width / image_size.GetWidth();
     int real_area_y = final_y + (map_area.map_y - (AREA_EFFECTIVE_SIZE / 2)) *