about summary refs log tree commit diff stats
path: root/src/area_popup.cpp
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2024-07-24 14:17:40 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2024-07-24 14:17:40 -0400
commite7503333e1a71fab0c97315ae0a8ac1388f10d14 (patch)
tree24aa1e3c49419f365cdd900f6e080f5fe72eca20 /src/area_popup.cpp
parent4ffb5871e4bc54ab6765fcd738835c295d1e2924 (diff)
downloadlingo-ap-tracker-e7503333e1a71fab0c97315ae0a8ac1388f10d14.tar.gz
lingo-ap-tracker-e7503333e1a71fab0c97315ae0a8ac1388f10d14.tar.bz2
lingo-ap-tracker-e7503333e1a71fab0c97315ae0a8ac1388f10d14.zip
Save analysis uses remote location for non-counting panels
Diffstat (limited to 'src/area_popup.cpp')
-rw-r--r--src/area_popup.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/area_popup.cpp b/src/area_popup.cpp index b18ba62..8d6487e 100644 --- a/src/area_popup.cpp +++ b/src/area_popup.cpp
@@ -55,7 +55,7 @@ void AreaPopup::UpdateIndicators() {
55 const Location& location = map_area.locations.at(section_id); 55 const Location& location = map_area.locations.at(section_id);
56 56
57 if (tracker_panel->IsPanelsMode()) { 57 if (tracker_panel->IsPanelsMode()) {
58 if (!location.panel) { 58 if (!location.single_panel) {
59 continue; 59 continue;
60 } 60 }
61 } else { 61 } else {
@@ -117,12 +117,12 @@ void AreaPopup::UpdateIndicators() {
117 if (IsLocationWinCondition(location)) { 117 if (IsLocationWinCondition(location)) {
118 checked = AP_HasReachedGoal(); 118 checked = AP_HasReachedGoal();
119 } else if (tracker_panel->IsPanelsMode()) { 119 } else if (tracker_panel->IsPanelsMode()) {
120 checked = location.panel && std::any_of( 120 const Panel& panel = GD_GetPanel(*location.single_panel);
121 location.panels.begin(), location.panels.end(), 121 if (panel.non_counting) {
122 [tracker_panel](int panel_id) { 122 checked = AP_HasCheckedGameLocation(location.ap_location_id);
123 const Panel& panel = GD_GetPanel(panel_id); 123 } else {
124 return tracker_panel->GetSolvedPanels().contains(panel.nodepath); 124 checked = tracker_panel->GetSolvedPanels().contains(panel.nodepath);
125 }); 125 }
126 } else { 126 } else {
127 checked = 127 checked =
128 AP_HasCheckedGameLocation(location.ap_location_id) || 128 AP_HasCheckedGameLocation(location.ap_location_id) ||