Merge branch 'master' into patch-6

Author: G-Moris

Client/core/CCore.cpp

@@ -156,6 +156,7 @@ CCore::CCore()
     m_bGettingIdleCallsFromMultiplayer = false;
     m_bWindowsTimerEnabled = false;
     m_timeDiscordAppLastUpdate = 0;
+    m_CurrentRefreshRate = 60;
 
     // Create tray icon
     m_pTrayIcon = new CTrayIcon();
@@ -1835,6 +1836,9 @@ void CCore::RecalculateFrameRateLimit(uint uiServerFrameRateLimit, bool bLogToCo
     if ((m_uiFrameRateLimit == 0 || uiClientScriptRate < m_uiFrameRateLimit) && uiClientScriptRate > 0)
         m_uiFrameRateLimit = uiClientScriptRate;
 
+    if (!IsConnected())
+        m_uiFrameRateLimit = m_CurrentRefreshRate;
+
     // Removes Limiter from Frame Graph if limit is zero and skips frame limit
     if (m_uiFrameRateLimit == 0)
     {
@@ -1861,6 +1865,12 @@ void CCore::SetClientScriptFrameRateLimit(uint uiClientScriptFrameRateLimit)
     RecalculateFrameRateLimit(-1, false);
 }
 
+void CCore::SetCurrentRefreshRate(uint value)
+{
+    m_CurrentRefreshRate = value;
+    RecalculateFrameRateLimit(-1, false);
+}
+
 //
 // Make sure the frame rate limit has been applied since the last call
 //
@@ -1921,7 +1931,7 @@ void CCore::ApplyQueuedFrameRateLimit()
             double dSpare = dTargetTimeToUse - m_FrameRateTimer.Get();
             if (dSpare <= 0.0)
                 break;
-            if (dSpare >= 2.0)
+            if (dSpare >= 10.0)
                 Sleep(1);
         }
         m_FrameRateTimer.Reset();

Client/core/CCore.h

@@ -223,6 +223,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     void ApplyQueuedFrameRateLimit();
     void EnsureFrameRateLimitApplied();
     void SetClientScriptFrameRateLimit(uint uiClientScriptFrameRateLimit);
+    void SetCurrentRefreshRate(uint value);
     void DoReliablePulse();
 
     bool IsTimingCheckpoints();
@@ -371,6 +372,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CElapsedTimeHD       m_FrameRateTimer;
     uint                 m_uiQueuedFrameRate;
     bool                 m_bQueuedFrameRateValid;
+    uint                 m_CurrentRefreshRate;
     bool                 m_requestNewNickname{false};
     EDiagnosticDebugType m_DiagnosticDebug;
 

Client/core/CMainMenu.cpp

@@ -778,6 +778,9 @@ void CMainMenu::SetIsIngame(bool bIsIngame)
         m_bIsIngame = bIsIngame;
         m_Settings.SetIsModLoaded(bIsIngame);
 
+        // Reset frame rate limit
+        CCore::GetSingleton().RecalculateFrameRateLimit(-1, false);
+
         m_ulMoveStartTick = GetTickCount32();
         if (bIsIngame)
         {

Client/core/CModManager.cpp

@@ -93,7 +93,7 @@ void CModManager::DoPulsePostFrame()
     if (m_client != nullptr)
         CCore::GetSingleton().EnsureFrameRateLimitApplied();            // Catch missed frames
     else
-        CCore::GetSingleton().ApplyFrameRateLimit(88);            // Limit when not connected
+        CCore::GetSingleton().ApplyFrameRateLimit();            // Limit when not connected
 
     if (m_state == State::PendingStart)
     {

Client/core/DXHook/CProxyDirect3D9.cpp

@@ -833,6 +833,13 @@ 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().SetCurrentRefreshRate(DisplayMode.RefreshRate);
+    }
 
     return hResult;
 }

Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MTA San Andreas 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-03-07 21:43+0000\n"
+"POT-Creation-Date: 2025-03-08 23:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -21,7 +21,7 @@ msgstr ""
 #. Create buttons
 #. OK button
 #: Client/gui/CGUIMessageBox_Impl.cpp:64 Client/loader/Dialogs.cpp:37
-#: Client/core/CMainMenu.cpp:1211 Client/core/CSettings.cpp:127
+#: Client/core/CMainMenu.cpp:1214 Client/core/CSettings.cpp:127
 #: Client/core/CSettings.cpp:4838 Client/core/CVersionUpdater.cpp:1607
 #: Client/core/CVersionUpdater.cpp:1823 Client/core/CVersionUpdater.cpp:1916
 #: Client/core/CVersionUpdater.cpp:1938 Client/core/CVersionUpdater.cpp:1956
@@ -47,7 +47,7 @@ msgstr ""
 #.
 #. /////////////////////////////////////////////////////////////////////////
 #: Client/gui/CGUIMessageBox_Impl.cpp:72 Client/loader/Dialogs.cpp:35
-#: Client/core/CMainMenu.cpp:1191 Client/core/CSettings.cpp:1413
+#: Client/core/CMainMenu.cpp:1194 Client/core/CSettings.cpp:1413
 #: Client/core/CSettings.cpp:1437 Client/core/CSettings.cpp:4542
 #: Client/core/CSettings.cpp:4616 Client/core/CSettings.cpp:4646
 #: Client/core/CSettings.cpp:4695 Client/core/CVersionUpdater.cpp:1572
@@ -57,7 +57,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:36 Client/core/CMainMenu.cpp:1190
+#: Client/loader/Dialogs.cpp:36 Client/core/CMainMenu.cpp:1193
 #: Client/core/CSettings.cpp:1412 Client/core/CSettings.cpp:1436
 #: Client/core/CSettings.cpp:4541 Client/core/CSettings.cpp:4615
 #: Client/core/CSettings.cpp:4645 Client/core/CSettings.cpp:4694
@@ -392,7 +392,7 @@ msgstr ""
 #: Client/core/CConnectManager.cpp:422 Client/core/CConnectManager.cpp:432
 #: Client/core/CSettings.cpp:2972 Client/core/CSettings.cpp:4219
 #: Client/core/CSettings.cpp:4247 Client/core/CSettings.cpp:4817
-#: Client/core/CCore.cpp:1261 Client/core/CGUI.cpp:93
+#: Client/core/CCore.cpp:1262 Client/core/CGUI.cpp:93
 #: Client/core/ServerBrowser/CServerBrowser.cpp:1261
 #: Client/core/ServerBrowser/CServerBrowser.cpp:1283
 #: Client/core/ServerBrowser/CServerBrowser.cpp:1340
@@ -460,7 +460,7 @@ msgstr ""
 msgid "MTA:SA cannot launch because patching GTA:SA has failed:"
 msgstr ""
 
-#: Client/loader/CInstallManager.cpp:1057 Client/core/CCore.cpp:806
+#: Client/loader/CInstallManager.cpp:1057 Client/core/CCore.cpp:807
 #, c-format
 msgid "MTA:SA cannot continue because drive %s does not have enough space."
 msgstr ""
@@ -1110,7 +1110,7 @@ msgstr ""
 
 #: Client/mods/deathmatch/logic/CResource.cpp:372
 #: Client/mods/deathmatch/logic/CClientGame.cpp:1096
-#: Client/core/CSettings.cpp:3520 Client/core/CCore.cpp:669
+#: Client/core/CSettings.cpp:3520 Client/core/CCore.cpp:670
 msgid "In-game"
 msgstr ""
 
@@ -1245,7 +1245,7 @@ msgstr ""
 
 #: Client/mods/deathmatch/logic/CClientGame.cpp:540
 #: Client/core/CMainMenu.cpp:302 Client/core/CSettings.cpp:3516
-#: Client/core/CCore.cpp:669
+#: Client/core/CCore.cpp:670
 msgid "Main menu"
 msgstr ""
 
@@ -1465,18 +1465,18 @@ msgid ""
 "Upgrade Windows to play on the latest servers."
 msgstr ""
 
-#: Client/core/CMainMenu.cpp:1184
+#: Client/core/CMainMenu.cpp:1187
 msgid ""
 "This will disconnect you from the current server.\n"
 "\n"
 "Are you sure you want to disconnect?"
 msgstr ""
 
-#: Client/core/CMainMenu.cpp:1188
+#: Client/core/CMainMenu.cpp:1191
 msgid "DISCONNECT WARNING"
 msgstr ""
 
-#: Client/core/CMainMenu.cpp:1209
+#: Client/core/CMainMenu.cpp:1212
 msgid "INFORMATION"
 msgstr ""
 
@@ -2712,110 +2712,110 @@ msgid ""
 "Waiting for response  -  %-3d"
 msgstr ""
 
-#: Client/core/CCore.cpp:808 Shared/mods/deathmatch/logic/Utils.cpp:129
+#: Client/core/CCore.cpp:809 Shared/mods/deathmatch/logic/Utils.cpp:129
 msgid "Fatal error"
 msgstr ""
 
-#: Client/core/CCore.cpp:929
+#: Client/core/CCore.cpp:930
 msgid "TO FIX, REMOVE THIS FILE:"
 msgstr ""
 
-#: Client/core/CCore.cpp:961
+#: Client/core/CCore.cpp:962
 #, c-format
 msgid "%s module is incorrect!"
 msgstr ""
 
-#: Client/core/CCore.cpp:1261
+#: Client/core/CCore.cpp:1262
 msgid "Error executing URL"
 msgstr ""
 
 #. m_pCommands->Add ( "e", CCommandFuncs::Editor );
 #. m_pCommands->Add ( "clear", CCommandFuncs::Clear );
-#: Client/core/CCore.cpp:1355
+#: Client/core/CCore.cpp:1356
 msgid "this help screen"
 msgstr ""
 
-#: Client/core/CCore.cpp:1356 Client/core/CCore.cpp:1357
+#: Client/core/CCore.cpp:1357 Client/core/CCore.cpp:1358
 msgid "exits the application"
 msgstr ""
 
-#: Client/core/CCore.cpp:1358
+#: Client/core/CCore.cpp:1359
 msgid "shows the version"
 msgstr ""
 
-#: Client/core/CCore.cpp:1359
+#: Client/core/CCore.cpp:1360
 msgid "shows the time"
 msgstr ""
 
-#: Client/core/CCore.cpp:1360
+#: Client/core/CCore.cpp:1361
 msgid "shows the hud"
 msgstr ""
 
-#: Client/core/CCore.cpp:1361
+#: Client/core/CCore.cpp:1362
 msgid "shows all the binds"
 msgstr ""
 
-#: Client/core/CCore.cpp:1362
+#: Client/core/CCore.cpp:1363
 msgid "shows your serial"
 msgstr ""
 
-#: Client/core/CCore.cpp:1371
+#: Client/core/CCore.cpp:1372
 msgid "connects to a server (host port nick pass)"
 msgstr ""
 
-#: Client/core/CCore.cpp:1372
+#: Client/core/CCore.cpp:1373
 msgid "connects to a previous server"
 msgstr ""
 
-#: Client/core/CCore.cpp:1373
+#: Client/core/CCore.cpp:1374
 msgid "binds a key (key control)"
 msgstr ""
 
-#: Client/core/CCore.cpp:1374
+#: Client/core/CCore.cpp:1375
 msgid "unbinds a key (key)"
 msgstr ""
 
-#: Client/core/CCore.cpp:1375
+#: Client/core/CCore.cpp:1376
 msgid "copies the default gta controls"
 msgstr ""
 
-#: Client/core/CCore.cpp:1376
+#: Client/core/CCore.cpp:1377
 msgid "outputs a screenshot"
 msgstr ""
 
-#: Client/core/CCore.cpp:1377
+#: Client/core/CCore.cpp:1378
 msgid "immediately saves the config"
 msgstr ""
 
-#: Client/core/CCore.cpp:1379
+#: Client/core/CCore.cpp:1380
 msgid "clears the debug view"
 msgstr ""
 
-#: Client/core/CCore.cpp:1380
+#: Client/core/CCore.cpp:1381
 msgid "scrolls the chatbox upwards"
 msgstr ""
 
-#: Client/core/CCore.cpp:1381
+#: Client/core/CCore.cpp:1382
 msgid "scrolls the chatbox downwards"
 msgstr ""
 
-#: Client/core/CCore.cpp:1382
+#: Client/core/CCore.cpp:1383
 msgid "scrolls the debug view upwards"
 msgstr ""
 
-#: Client/core/CCore.cpp:1383
+#: Client/core/CCore.cpp:1384
 msgid "scrolls the debug view downwards"
 msgstr ""
 
-#: Client/core/CCore.cpp:1386
+#: Client/core/CCore.cpp:1387
 msgid "shows the memory statistics"
 msgstr ""
 
-#: Client/core/CCore.cpp:1387
+#: Client/core/CCore.cpp:1388
 msgid "shows the frame timing graph"
 msgstr ""
 
-#: Client/core/CCore.cpp:1391
+#: Client/core/CCore.cpp:1392
 msgid "for developers: reload news"
 msgstr ""