From d590aa88a4f57e1dda9d9da56c60c6db73206e25 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sat, 1 Jan 2022 17:53:12 +0100 Subject: Config: Port remaining General settings to new config system. --- Source/Core/VideoCommon/RenderBase.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 2a1d861ac5..155cd8e2c5 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -555,8 +555,6 @@ void Renderer::CheckForConfigChanges() // Create On-Screen-Messages void Renderer::DrawDebugText() { - const auto& config = SConfig::GetInstance(); - if (g_ActiveConfig.bShowFPS) { // Position in the top-right corner of the screen. @@ -576,10 +574,10 @@ void Renderer::DrawDebugText() ImGui::End(); } - const bool show_movie_window = config.m_ShowFrameCount || config.m_ShowLag || - Config::Get(Config::MAIN_MOVIE_SHOW_INPUT_DISPLAY) || - Config::Get(Config::MAIN_MOVIE_SHOW_RTC) || - Config::Get(Config::MAIN_MOVIE_SHOW_RERECORD); + const bool show_movie_window = + Config::Get(Config::MAIN_SHOW_FRAME_COUNT) || Config::Get(Config::MAIN_SHOW_LAG) || + Config::Get(Config::MAIN_MOVIE_SHOW_INPUT_DISPLAY) || + Config::Get(Config::MAIN_MOVIE_SHOW_RTC) || Config::Get(Config::MAIN_MOVIE_SHOW_RERECORD); if (show_movie_window) { // Position under the FPS display. @@ -598,12 +596,12 @@ void Renderer::DrawDebugText() ImGui::Text("Input: %" PRIu64 " / %" PRIu64, Movie::GetCurrentInputCount(), Movie::GetTotalInputCount()); } - else if (config.m_ShowFrameCount) + else if (Config::Get(Config::MAIN_SHOW_FRAME_COUNT)) { ImGui::Text("Frame: %" PRIu64, Movie::GetCurrentFrame()); ImGui::Text("Input: %" PRIu64, Movie::GetCurrentInputCount()); } - if (SConfig::GetInstance().m_ShowLag) + if (Config::Get(Config::MAIN_SHOW_LAG)) ImGui::Text("Lag: %" PRIu64 "\n", Movie::GetCurrentLagCount()); if (Config::Get(Config::MAIN_MOVIE_SHOW_INPUT_DISPLAY)) ImGui::TextUnformatted(Movie::GetInputDisplay().c_str()); -- cgit v1.2.3