Refactored the refactor to match guidelines and one of the last cleanups of code

Author: PerikiyoXD

Client/cefweb/CWebCore.cpp

@@ -479,11 +479,11 @@ void CWebCore::OnPostScreenshot()
     }
 }
 
-void CWebCore::OnFPSLimitChange(int iFPS)
+void CWebCore::OnFPSLimitChange(std::uint16_t fps)
 {
-    for (auto& pWebView : m_WebViews)
+    for (auto& webView : m_WebViews)
     {
-        pWebView->GetCefBrowser()->GetHost()->SetWindowlessFrameRate(iFPS);
+        webView->GetCefBrowser()->GetHost()->SetWindowlessFrameRate(fps);
     }
 }
 

Client/cefweb/CWebCore.h

@@ -96,7 +96,7 @@ class CWebCore : public CWebCoreInterface
     void OnPreScreenshot();
     void OnPostScreenshot();
 
-    void OnFPSLimitChange(int newFPS);
+    void OnFPSLimitChange(std::uint16_t fps) override;
 
     bool SetGlobalAudioVolume(float fVolume);
 

Client/core/CClientVariables.cpp

@@ -235,12 +235,13 @@ void CClientVariables::ValidateValues()
     ClampValue("console_pos", CVector2D(0, 0), CVector2D(uiViewportWidth - 32, uiViewportHeight - 32));
     ClampValue("console_size", CVector2D(50, 50), CVector2D(uiViewportWidth - 32, uiViewportHeight - 32));
 
-    { // Special case, 0 or clamped range. Provided by ValidateFPS.
-        uint uiTemp;
-        CVARS_GET("fps_limit", uiTemp);
-        uiTemp = FPSLimiter::ValidateFPS(uiTemp);
-        CVARS_SET("fps_limit", uiTemp);
-    }
+    // CVars need a better API for this (Issue #4427)
+    int temp;
+    CVARS_GET("fps_limit", temp);
+    std::uint16_t fps = static_cast<std::uint16_t>(temp);
+    FPSLimits::IsValidAndSetValid(fps, fps);
+    CVARS_SET("fps_limit", fps);
+
 
     ClampValue("chat_font", 0, 3);
     ClampValue("chat_lines", 3, 62);

Client/core/CCommands.cpp

@@ -182,9 +182,9 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
                 // HACK: Foul dirty hack to force vsync (Rework on #4427)
                 if (key == "vsync")
                 {
-                    bool bVSync;
-                    CVARS_GET("vsync", bVSync);
-                    CCore::GetSingleton().GetFPSLimiter()->SetDisplayVSync(bVSync);
+                    bool vSync;
+                    CVARS_GET("vsync", vSync);
+                    CCore::GetSingleton().GetFPSLimiter()->SetDisplayVSync(vSync);
                 }
             }
             else

Client/core/CCore.cpp

@@ -1347,7 +1347,7 @@ void CCore::OnModUnload()
     m_pKeyBinds->RemoveAllControlFunctions();
 
     // Reset client script frame rate limit
-    GetFPSLimiter()->SetClientEnforcedFPS(FPSLimiter::FPS_LIMIT_UNLIMITED);
+    GetFPSLimiter()->SetClientEnforcedFPS(FPSLimits::FPS_UNLIMITED);
 
     // Clear web whitelist
     if (m_pWebCore)
@@ -1835,12 +1835,9 @@ void CCore::OnGameTimerUpdate()
     // earlier in the callpath (CModManager::DoPulsePreFrame, CModManager::DoPulsePostFrame)
 }
 
-void CCore::OnFPSLimitChange(uint32_t uiFPS)
+void CCore::OnFPSLimitChange(std::uint16_t fps)
 {
-    // TODO: (pxd) Notify the mod manager maybe? If not remove this comment
-
-    // Update core's webcore FPS limit
-    GetWebCore()->OnFPSLimitChange(uiFPS);
+    GetWebCore()->OnFPSLimitChange(fps);            // Update core's webcore FPS limit
 }
 
 //

Client/core/CCore.h

@@ -108,7 +108,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CTrayIconInterface*                GetTrayIcon() { return m_pTrayIcon; };
     std::shared_ptr<CDiscordInterface> GetDiscord();
     CSteamClient*                      GetSteamClient() { return m_steamClient.get(); }
-    FPSLimiter::FPSLimiterInterface*   GetFPSLimiter() { return m_pFPSLimiter.get(); }
+    FPSLimiter::FPSLimiterInterface*   GetFPSLimiter() const noexcept { return m_pFPSLimiter.get(); }
 
     void SaveConfig(bool bWaitUntilFinished = false);
 
@@ -223,7 +223,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     void InitiateDataFilesFix() { m_pLocalGUI->InitiateDataFilesFix(); }
 
     // FPS Limiter
-    void OnFPSLimitChange(uint32_t uiFPS);            // Called when FPS limit changes
+    void OnFPSLimitChange(std::uint16_t fps);
 
     void DoReliablePulse();
 

Client/core/CModManager.cpp

@@ -79,17 +79,10 @@ void CModManager::DoPulsePostFrame()
 {
     auto handleStateChange = [&]()
     {
-        switch (m_state)
-        {
-            case State::PendingStart:
-                Start();
-                break;
-            case State::PendingStop:
-                Stop();
-                break;
-            default:
-                break;
-        }
+        if (m_state == State::PendingStart)
+            Start();
+        else if (m_state == State::PendingStop)
+            Stop();
     };
 
     TIMING_GRAPH("+DoPulsePostFrame");