From 829bffa5912f1b6da4ebba580450cfba6d320295 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Fri, 21 Mar 2025 13:00:13 -0400 Subject: Use sync panels for achievement state --- src/achievements_pane.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/achievements_pane.cpp') diff --git a/src/achievements_pane.cpp b/src/achievements_pane.cpp index b255f3b..d23c434 100644 --- a/src/achievements_pane.cpp +++ b/src/achievements_pane.cpp @@ -8,13 +8,14 @@ AchievementsPane::AchievementsPane(wxWindow* parent) AppendColumn("Achievement"); for (int panel_id : GD_GetAchievementPanels()) { - achievement_names_.push_back(GD_GetPanel(panel_id).achievement_name); + const Panel& panel = GD_GetPanel(panel_id); + achievements_.emplace_back(panel.achievement_name, panel.solve_index); } - std::sort(std::begin(achievement_names_), std::end(achievement_names_)); + std::sort(std::begin(achievements_), std::end(achievements_)); - for (int i = 0; i < achievement_names_.size(); i++) { - InsertItem(i, achievement_names_.at(i)); + for (int i = 0; i < achievements_.size(); i++) { + InsertItem(i, std::get<0>(achievements_.at(i))); } SetColumnWidth(0, wxLIST_AUTOSIZE_USEHEADER); @@ -23,8 +24,8 @@ AchievementsPane::AchievementsPane(wxWindow* parent) } void AchievementsPane::UpdateIndicators() { - for (int i = 0; i < achievement_names_.size(); i++) { - if (AP_HasAchievement(achievement_names_.at(i))) { + for (int i = 0; i < achievements_.size(); i++) { + if (AP_IsPanelSolved(std::get<1>(achievements_.at(i)))) { SetItemTextColour(i, *wxBLACK); } else { SetItemTextColour(i, *wxRED); -- cgit 1.4.1