Tweaks

PerikiyoXD · PerikiyoXD · commit 72e12cf210bd · 2025-09-08T15:08:12.000+02:00
diff --git a/Client/core/CCommands.cpp b/Client/core/CCommands.cpp
@@ -179,32 +179,12 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
                     CCore::GetSingleton().GetFPSLimiter()->SetUserDefinedFPS(fpsVal);
                 }
 
-                // HACK: Foul dirty hack to force vsync (Awaiting PR)
+                // HACK: Foul dirty hack to force vsync (Rework on #4427)
                 if (key == "vsync")
                 {
                     bool bVSync;
                     CVARS_GET("vsync", bVSync);
-                    if (!bVSync)
-                    {
-                        OutputDebugLine("VSync disabled, removing fps_limit display refresh rate");
-                        CCore::GetSingleton().GetFPSLimiter()->SetDisplayRefreshRate(0);
-                    }
-                    else
-                    {
-                        // HACK: (pxd) Get refresh rate from Direct3D? Should this go elsewhere?
-                        D3DDISPLAYMODE DisplayMode;
-                        IDirect3D9*    pD3D9 = CProxyDirect3D9::StaticGetDirect3D();
-                        if (pD3D9 && pD3D9->GetAdapterDisplayMode(D3DADAPTER_DEFAULT, &DisplayMode) == D3D_OK)            // Query current display mode
-                        {
-                            OutputDebugLine(SString("VSync enabled, setting fps_limit to display refresh rate %d Hz", DisplayMode.RefreshRate));
-                            CCore::GetSingleton().GetFPSLimiter()->SetDisplayRefreshRate(DisplayMode.RefreshRate);
-                        }
-                        else
-                        {
-                            OutputDebugLine("VSync enabled, but failed to get display refresh rate, defaulting to 60 Hz");
-                            CCore::GetSingleton().GetFPSLimiter()->SetDisplayRefreshRate(60);
-                        }
-                    }
+                    CCore::GetSingleton().GetFPSLimiter()->SetDisplayVSync(bVSync);
                 }
             }
             else
diff --git a/Client/core/DXHook/CProxyDirect3D9.cpp b/Client/core/DXHook/CProxyDirect3D9.cpp
@@ -833,13 +833,6 @@ HRESULT HandleCreateDeviceResult(HRESULT hResult, IDirect3D9* pDirect3D, UINT Ad
         strMessage += SString("Direct3D CreateDevice error: %08x", hResult);
         BrowseToSolution("d3dcreatedevice-fail", EXIT_GAME_FIRST | ASK_GO_ONLINE, strMessage);
     }
-    else
-    {
-        // Get current refresh rate
-        D3DDISPLAYMODE DisplayMode;
-        if (pDirect3D->GetAdapterDisplayMode(Adapter, &DisplayMode) == D3D_OK)
-            CCore::GetSingleton().GetFPSLimiter()->SetDisplayRefreshRate(DisplayMode.RefreshRate);
-    }
 
     return hResult;
 }
diff --git a/Client/core/FPSLimiter.cpp b/Client/core/FPSLimiter.cpp
@@ -49,7 +49,10 @@ namespace FPSLimiter
         m_data.serverEnforcedFPS = 0;
         m_data.clientEnforcedFPS = 0;
         m_data.userDefinedFPS = 0;
-        // m_data.displayRefreshRate = 0; // We do not reset display refresh rate
+
+        bool bVSync;
+        CVARS_GET("vsync", bVSync);
+        m_data.displayRefreshRate = bVSync ? GetDisplayRefreshRate() : 0;
         CalculateCurrentFPSLimit();
     }
 
@@ -86,7 +89,7 @@ namespace FPSLimiter
         if (m_data.displayRefreshRate > FPS_LIMIT_MIN && m_data.displayRefreshRate < minFPS)
         {
             minFPS = m_data.displayRefreshRate;
-            enforcer = EnforcerType::RefreshRate;
+            enforcer = EnforcerType::VSync;
         }
 
         // If the lowest matches the active target, return its enforcer
@@ -115,16 +118,28 @@ namespace FPSLimiter
         CalculateCurrentFPSLimit();
     }
 
-    void FPSLimiter::SetDisplayRefreshRate(std::uint32_t refreshRate)
+    void FPSLimiter::SetDisplayVSync(bool enabled)
     {
-        m_data.displayRefreshRate = ValidateFPS(refreshRate);
+        m_data.displayRefreshRate = enabled ? GetDisplayRefreshRate() : 0;
         CalculateCurrentFPSLimit();
     }
 
 #pragma endregion Interface
 
 #pragma region Internal
 
+    std::uint32_t FPSLimiter::GetDisplayRefreshRate()
+    {
+        D3DDISPLAYMODE DisplayMode;
+        IDirect3D9*    pD3D9 = CProxyDirect3D9::StaticGetDirect3D();
+        if (pD3D9 && pD3D9->GetAdapterDisplayMode(D3DADAPTER_DEFAULT, &DisplayMode) == D3D_OK)
+        {
+            return ValidateFPS(DisplayMode.RefreshRate);
+        }
+        // Fallback to 60 Hz if unable to get refresh rate
+        return 60;
+    }
+
     // Priority: Server > Client > User > None
     void FPSLimiter::CalculateCurrentFPSLimit()
     {
@@ -154,10 +169,6 @@ namespace FPSLimiter
 
         m_data.activeFPSTarget = minFPS;
 
-        std::stringstream ss;
-        ss << "FPSLimiter: Calculated active FPS limit: " << m_data.activeFPSTarget;
-        OutputDebugLine(ss.str().c_str());
-
         // If limit changed, reset frame timing
         if (oldLimit != m_data.activeFPSTarget)
         {
@@ -168,13 +179,9 @@ namespace FPSLimiter
             OnFPSLimitChange();
         }
 
-        ss.clear();
-        ss << "FPSLimiter: Calculated current FPS limit : " << m_data.activeFPSTarget
-           << " (Server: " << m_data.serverEnforcedFPS
-           << ", Client: " << m_data.clientEnforcedFPS
-           << ", User: " << m_data.userDefinedFPS
-           << ", Display: " << m_data.displayRefreshRate
-           << ") Enforcer: " << EnumToString(GetEnforcer());
+        std::stringstream ss;
+        ss << "FPSLimiter: FPS limit changed to " << (m_data.activeFPSTarget == 0 ? "unlimited" : std::to_string(m_data.activeFPSTarget));
+        ss << " (Enforced by: " << EnumToString(GetEnforcer()) << ")";
 
         auto* pConsole = CCore::GetSingleton().GetConsole();
         if (pConsole)
@@ -262,7 +269,11 @@ namespace FPSLimiter
                 HMODULE ntdll = GetModuleHandleA("ntdll.dll");
                 if (ntdll)
                 {
-                    NtSetTimerResolution setRes = reinterpret_cast<NtSetTimerResolution>(GetProcAddress(ntdll, "NtSetTimerResolution"));
+                    auto proc = GetProcAddress(ntdll, "NtSetTimerResolution");
+#pragma warning(push)
+#pragma warning(suppress : 4191)
+                    auto setRes = reinterpret_cast<NtSetTimerResolution>(proc);
+#pragma warning(pop)
                     if (setRes)
                     {
                         ULONG actualRes;
@@ -356,6 +367,14 @@ namespace FPSLimiter
 
 #pragma endregion Events
 
+    IMPLEMENT_ENUM_BEGIN(EnforcerType)
+    ADD_ENUM(EnforcerType::None, "none")
+    ADD_ENUM(EnforcerType::VSync, "vsync")
+    ADD_ENUM(EnforcerType::UserDefined, "user-defined")
+    ADD_ENUM(EnforcerType::Client, "client")
+    ADD_ENUM(EnforcerType::Server, "server")
+    IMPLEMENT_ENUM_END("EnforcerType");
+
 };            // namespace FPSLimiter
 
 std::uint32_t FPSLimiter::ValidateFPS(std::uint32_t uiFPS)
diff --git a/Client/core/FPSLimiter.h b/Client/core/FPSLimiter.h
@@ -55,10 +55,12 @@ namespace FPSLimiter
         void SetServerEnforcedFPS(std::uint32_t frameRateLimit);
         void SetClientEnforcedFPS(std::uint32_t frameRateLimit);
         void SetUserDefinedFPS(std::uint32_t frameRateLimit);
-        void SetDisplayRefreshRate(std::uint32_t refreshRate);
+        void SetDisplayVSync(bool enabled);
 
     public:
         // Internal
+        std::uint32_t GetDisplayRefreshRate();
+
         void CalculateCurrentFPSLimit();
         void SetFrameRateThrottle();
 
diff --git a/Client/sdk/core/FPSLimiterInterface.h b/Client/sdk/core/FPSLimiterInterface.h
@@ -22,10 +22,10 @@ namespace FPSLimiter
     enum class EnforcerType : std::uint8_t
     {
         None = 0,                   // No frame rate limit enforced (unlimited FPS)
-        RefreshRate = 1,            // Frame rate limit set to display refresh rate
-        UserDefined = 2,            // Frame rate limit set by the user via settings menu or console variable
-        Client = 3,                 // Frame rate limit enforced by the client (e.g., script)
-        Server = 4                  // Frame rate limit enforced by the server
+        VSync = 1,                  // Frame rate limited by display refresh rate
+        UserDefined = 2,            // Frame rate limited by the user via settings menu or console variable
+        Client = 3,                 // Frame rate limited by the client script
+        Server = 4                  // Frame rate limited by the server script
     };
     DECLARE_ENUM(EnforcerType);
 
@@ -49,7 +49,7 @@ namespace FPSLimiter
         virtual void SetServerEnforcedFPS(std::uint32_t frameRateLimit) = 0;            // Set the server-enforced frame rate limit (0 = no limit)
         virtual void SetClientEnforcedFPS(std::uint32_t frameRateLimit) = 0;            // Set the client-enforced frame rate limit (0 = no limit)
         virtual void SetUserDefinedFPS(std::uint32_t frameRateLimit) = 0;               // Set the user-defined frame rate limit (0 = no limit)
-        virtual void SetDisplayRefreshRate(std::uint32_t refreshRate) = 0;              // Set the display refresh rate to cap FPS (0 = no cap)
+        virtual void SetDisplayVSync(bool enabled) = 0;                                 // Set the display refresh rate to cap FPS (0 = no cap)
 
         virtual void OnFPSLimitChange() = 0;            // Event handler called when the active frame rate limit changes
         virtual void OnFrameStart() = 0;                // Event handler called at the start of each frame

Original file line number	Diff line number	Diff line change
`@@ -833,13 +833,6 @@ HRESULT HandleCreateDeviceResult(HRESULT hResult, IDirect3D9* pDirect3D, UINT Ad`
`833`	`833`	`strMessage += SString("Direct3D CreateDevice error: %08x", hResult);`
`834`	`834`	`BrowseToSolution("d3dcreatedevice-fail", EXIT_GAME_FIRST \| ASK_GO_ONLINE, strMessage);`
`835`	`835`	`}`
`836`		`- else`
`837`		`- {`
`838`		`- // Get current refresh rate`
`839`		`- D3DDISPLAYMODE DisplayMode;`
`840`		`- if (pDirect3D->GetAdapterDisplayMode(Adapter, &DisplayMode) == D3D_OK)`
`841`		`- CCore::GetSingleton().GetFPSLimiter()->SetDisplayRefreshRate(DisplayMode.RefreshRate);`
`842`		`- }`
`843`	`836`
`844`	`837`	`return hResult;`
`845`	`838`	`}`