diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-06-06 22:42:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-06 22:42:53 +0200 |
| commit | 81b6bfaa1e1804cf9d8ba4068fcbfe2c92a19e98 (patch) | |
| tree | 6f8a274956eeb41ff5f8f47742a399cef307c856 /Source/Core/VideoCommon/OnScreenUI.cpp | |
| parent | ca22d0af574376594395cf562c86fb60343fb4a9 (diff) | |
| parent | 22aa88109f5a5964e1b66d31221647cafab7f0f5 (diff) | |
Merge pull request #12832 from JosJuice/retro-achievements-less-ifdefs
Use a stub AchivementManager when USE_RETRO_ACHIEVEMENTS isn't defined
Diffstat (limited to 'Source/Core/VideoCommon/OnScreenUI.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/OnScreenUI.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/OnScreenUI.cpp b/Source/Core/VideoCommon/OnScreenUI.cpp index a7ecb263b4..1d5a432d8a 100644 --- a/Source/Core/VideoCommon/OnScreenUI.cpp +++ b/Source/Core/VideoCommon/OnScreenUI.cpp @@ -331,9 +331,9 @@ void OnScreenUI::DrawDebugText() ImGui::TextUnformatted(profile_output.c_str()); } -#ifdef USE_RETRO_ACHIEVEMENTS void OnScreenUI::DrawChallengesAndLeaderboards() { +#ifdef USE_RETRO_ACHIEVEMENTS std::lock_guard lg{AchievementManager::GetInstance().GetLock()}; const auto& challenge_icons = AchievementManager::GetInstance().GetChallengeIcons(); const auto& leaderboard_progress = AchievementManager::GetInstance().GetActiveLeaderboards(); @@ -396,8 +396,8 @@ void OnScreenUI::DrawChallengesAndLeaderboards() } ImGui::End(); } -} #endif // USE_RETRO_ACHIEVEMENTS +} void OnScreenUI::Finalize() { @@ -406,9 +406,7 @@ void OnScreenUI::Finalize() g_perf_metrics.DrawImGuiStats(m_backbuffer_scale); DrawDebugText(); OSD::DrawMessages(); -#ifdef USE_RETRO_ACHIEVEMENTS DrawChallengesAndLeaderboards(); -#endif // USE_RETRO_ACHIEVEMENTS ImGui::Render(); } |