From bf23fcfc1fc838fd7ee8dc75dce46fbd7f432945 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Sep 2015 09:43:03 -0400 Subject: [PATCH] FPSCounter: Don't provide direct access to m_fps --- Source/Core/VideoCommon/FPSCounter.h | 5 +++-- Source/Core/VideoCommon/RenderBase.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoCommon/FPSCounter.h b/Source/Core/VideoCommon/FPSCounter.h index 21539099db..a67939e287 100644 --- a/Source/Core/VideoCommon/FPSCounter.h +++ b/Source/Core/VideoCommon/FPSCounter.h @@ -11,16 +11,17 @@ class FPSCounter { public: - unsigned int m_fps; - // Initializes the FPS counter. FPSCounter(); // Called when a frame is rendered. Returns the value to be displayed on // screen as the FPS counter (updated every second). int Update(); + + unsigned int GetFPS() const { return m_fps; } private: + unsigned int m_fps; unsigned int m_counter; unsigned int m_fps_last_counter; Common::Timer m_update_time; diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 55a6cb8760..a35e3fe94e 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -295,7 +295,7 @@ void Renderer::DrawDebugText() if (g_ActiveConfig.bShowFPS || SConfig::GetInstance().m_ShowFrameCount) { if (g_ActiveConfig.bShowFPS) - final_cyan += StringFromFormat("FPS: %d", g_renderer->m_fps_counter.m_fps); + final_cyan += StringFromFormat("FPS: %u", g_renderer->m_fps_counter.GetFPS()); if (g_ActiveConfig.bShowFPS && SConfig::GetInstance().m_ShowFrameCount) final_cyan += " - ";