1 files changed, 10 insertions, 22 deletions

@@ -50,21 +50,15 @@ void AreaPopup::ResetIndicators() {
   for (int section_id = 0; section_id < map_area.locations.size();
        section_id++) {
     const Location& location = map_area.locations.at(section_id);
-    if (IsLocationPostgame(location.ap_location_id)) {
+    if ((!AP_IsLocationVisible(location.classification) ||
+         IsLocationPostgame(location.ap_location_id)) &&
+        !(location.hunt &&
+          GetTrackerConfig().visible_panels == TrackerConfig::kHUNT_PANELS) &&
+        !(location.single_panel &&
+          GetTrackerConfig().visible_panels == TrackerConfig::kALL_PANELS)) {
       continue;
     }
 
-    if (tracker_panel->IsPanelsMode()) {
-      if (!location.single_panel) {
-        continue;
-      }
-    } else {
-      if (!AP_IsLocationVisible(location.classification) &&
-          !(location.hunt && GetTrackerConfig().show_hunt_panels)) {
-        continue;
-      }
-    }
-
     indicators_.emplace_back(section_id, kLOCATION, acc_height);
 
     wxSize item_extent = mem_dc.GetTextExtent(location.name);
@@ -77,7 +71,7 @@ void AreaPopup::ResetIndicators() {
     }
   }
 
-  if (AP_IsPaintingShuffle() && !tracker_panel->IsPanelsMode()) {
+  if (AP_IsPaintingShuffle()) {
     for (int painting_id : map_area.paintings) {
       if (IsPaintingPostgame(painting_id)) {
         continue;
@@ -135,17 +129,11 @@ void AreaPopup::UpdateIndicators() {
         bool checked = false;
         if (IsLocationWinCondition(location)) {
           checked = AP_HasReachedGoal();
-        } else if (tracker_panel->IsPanelsMode()) {
-          const Panel& panel = GD_GetPanel(*location.single_panel);
-          if (panel.non_counting) {
-            checked = AP_HasCheckedGameLocation(location.ap_location_id);
-          } else {
-            checked = tracker_panel->GetSolvedPanels().contains(panel.nodepath);
-          }
         } else {
           checked = AP_HasCheckedGameLocation(location.ap_location_id) ||
-                    (location.hunt &&
-                     AP_HasCheckedHuntPanel(location.ap_location_id));
+                    (location.single_panel &&
+                     AP_IsPanelSolved(
+                         GD_GetPanel(*location.single_panel).solve_index));
         }
 
         const wxBitmap* eye_ptr = checked ? checked_eye_ : unchecked_eye_;