From b0f9bb9f136053c3fb164704e4d34a0ab0dd5dea Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 20 Jul 2020 11:22:53 +0200 Subject: Port some settings to the new config system Other than the controller settings and JIT debug settings, these are the only settings which were defined in Java code but not defined in the new config system in C++. (There are still a lot of settings that are defined in the new config system but not yet saveable in the new config system, though.) --- Source/Core/VideoCommon/OnScreenDisplay.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoCommon/OnScreenDisplay.cpp') diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index 359e17ebb0..e08bfb0970 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -13,9 +13,10 @@ #include #include "Common/CommonTypes.h" +#include "Common/Config/Config.h" #include "Common/Timer.h" -#include "Core/ConfigManager.h" +#include "Core/Config/MainSettings.h" namespace OSD { @@ -94,7 +95,7 @@ void AddMessage(std::string message, u32 ms, u32 argb) void DrawMessages() { - const bool draw_messages = SConfig::GetInstance().bOnScreenDisplayMessages; + const bool draw_messages = Config::Get(Config::MAIN_OSD_MESSAGES); const u32 now = Common::Timer::GetTimeMs(); const float current_x = LEFT_MARGIN * ImGui::GetIO().DisplayFramebufferScale.x; float current_y = TOP_MARGIN * ImGui::GetIO().DisplayFramebufferScale.y; -- cgit v1.2.3