Merge branch 'main' into panels

1 files changed, 11 insertions, 9 deletions

@@ -180,7 +180,7 @@ void TrackerPanel::Redraw() {
   for (AreaIndicator &area : areas_) {
     const MapArea &map_area = GD_GetMapArea(area.area_id);
     if (panels_mode_) {
-      area.active = map_area.panel;
+      area.active = map_area.has_single_panel;
     } else if (!AP_IsLocationVisible(map_area.classification) &&
         !(map_area.hunt && GetTrackerConfig().show_hunt_panels) &&
         !(AP_IsPaintingShuffle() && !map_area.paintings.empty())) {
@@ -200,11 +200,14 @@ void TrackerPanel::Redraw() {
       if (IsLocationWinCondition(section)) {
         has_unchecked = !AP_HasReachedGoal();
       } else if (panels_mode_) {
-        has_unchecked = section.panel && std::any_of(
-            section.panels.begin(), section.panels.end(), [this](int panel_id) {
-              const Panel &panel = GD_GetPanel(panel_id);
-              return !solved_panels_.contains(panel.nodepath);
-            });
+        if (section.single_panel) {
+          const Panel &panel = GD_GetPanel(*section.single_panel);
+          if (panel.non_counting) {
+            has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
+          } else {
+            has_unchecked = !solved_panels_.contains(panel.nodepath);
+          }
+        }
       } else if (AP_IsLocationVisible(section.classification)) {
         has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
       } else if (section.hunt && GetTrackerConfig().show_hunt_panels) {
@@ -223,9 +226,8 @@ void TrackerPanel::Redraw() {
     if (AP_IsPaintingShuffle() && !panels_mode_) {
       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);
-
+        bool reachable = IsPaintingReachable(painting_id);
+        if (!reachable || !AP_IsPaintingChecked(painting.internal_id)) {
           if (reachable) {
             has_reachable_unchecked = true;
           } else {