diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-09-08 08:51:43 -0400 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-09-08 08:51:43 -0400 |
| commit | 0e6be5bbe8c506882e8100ccaaf13a5f58079f97 (patch) | |
| tree | 4fee4d578e7936cb4052a74b93064c5ea845521f /src/area_popup.cpp | |
| parent | c443acfd0b25b3e4f3446f795777b8dd18b00e2b (diff) | |
| parent | 86b4b06e78c5c71588c1b55273969a1327a6710a (diff) | |
| download | lingo-ap-tracker-0e6be5bbe8c506882e8100ccaaf13a5f58079f97.tar.gz lingo-ap-tracker-0e6be5bbe8c506882e8100ccaaf13a5f58079f97.tar.bz2 lingo-ap-tracker-0e6be5bbe8c506882e8100ccaaf13a5f58079f97.zip | |
Merge branch 'main' into panels
Diffstat (limited to 'src/area_popup.cpp')
| -rw-r--r-- | src/area_popup.cpp | 14 |
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) || |