Created AchievementBox Qt object

AchievementBox is an extension of QGroupBox that contains the data for a single achievement, initialized with the achievement data and able to reference AchievementManager to update itself.

Source/Core/Core/AchievementManager.cpp

@@ -306,6 +306,11 @@ AchievementManager::PointSpread AchievementManager::TallyScore() const
   return spread;
 }
 
+rc_client_t* AchievementManager::GetClient()
+{
+  return m_client;
+}
+
 rc_api_fetch_game_data_response_t* AchievementManager::GetGameData()
 {
   return &m_game_data;
@@ -316,10 +321,20 @@ const AchievementManager::BadgeStatus& AchievementManager::GetGameBadge() const
   return m_game_badge;
 }
 
-const AchievementManager::UnlockStatus&
+const AchievementManager::BadgeStatus& AchievementManager::GetAchievementBadge(AchievementId id,
+                                                                               bool locked) const
+{
+  auto& badge_list = locked ? m_locked_badges : m_locked_badges;
+  auto itr = badge_list.find(id);
+  return (itr == badge_list.end()) ? m_default_badge : itr->second;
+}
+
+const AchievementManager::UnlockStatus*
 AchievementManager::GetUnlockStatus(AchievementId achievement_id) const
 {
-  return m_unlock_map.at(achievement_id);
+  if (m_unlock_map.count(achievement_id) < 1)
+    return nullptr;
+  return &m_unlock_map.at(achievement_id);
 }
 
 AchievementManager::ResponseType

Source/Core/Core/AchievementManager.h

@@ -136,9 +136,11 @@ public:
   const BadgeStatus& GetPlayerBadge() const;
   std::string_view GetGameDisplayName() const;
   PointSpread TallyScore() const;
+  rc_client_t* GetClient();
   rc_api_fetch_game_data_response_t* GetGameData();
   const BadgeStatus& GetGameBadge() const;
-  const UnlockStatus& GetUnlockStatus(AchievementId achievement_id) const;
+  const BadgeStatus& GetAchievementBadge(AchievementId id, bool locked) const;
+  const UnlockStatus* GetUnlockStatus(AchievementId achievement_id) const;
   AchievementManager::ResponseType GetAchievementProgress(AchievementId achievement_id, u32* value,
                                                           u32* target);
   const std::unordered_map<AchievementId, LeaderboardStatus>& GetLeaderboardsInfo() const;
@@ -163,6 +165,8 @@ private:
     std::unique_ptr<DiscIO::Volume> volume;
   };
 
+  const BadgeStatus m_default_badge;
+
   static void* FilereaderOpenByFilepath(const char* path_utf8);
   static void* FilereaderOpenByVolume(const char* path_utf8);
   static void FilereaderSeek(void* file_handle, int64_t offset, int origin);