Merge remote-tracking branch 'upstream/master' into feature/add-new-cj-clothes

Author: W3lac3

Client/core/CClientVariables.cpp

@@ -357,6 +357,7 @@ void CClientVariables::LoadDefaults()
     DEFAULT("discord_rpc_share_data", false);                                         // Consistent Rich Presence data sharing
     DEFAULT("discord_rpc_share_data_firsttime", false);                               // Display the user data sharing consent dialog box - for the first time
     DEFAULT("browser_enable_gpu", true);                                              // Enable GPU in CEF? (allows stuff like WebGL to function)
+    DEFAULT("process_cpu_affinity", false);                                            // Set CPU 0 affinity to improve game performance and fix the known issue in single-threaded games
 
     if (!Exists("locale"))
     {

Client/core/CConnectManager.cpp

@@ -10,7 +10,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
-#include "net/packetenums.h"
+#include "net/Packets.h"
 using namespace std;
 
 static CConnectManager* g_pConnectManager = NULL;

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();
@@ -1794,6 +1795,17 @@ void CCore::ApplyCoreInitSettings()
 
         SetApplicationSettingInt("reset-settings-revision", 21486);
     }
+
+    // Set process settings
+    HANDLE currProc = GetCurrentProcess();
+
+    // Process priority
+    int PriorityClassList[] = {NORMAL_PRIORITY_CLASS, ABOVE_NORMAL_PRIORITY_CLASS, HIGH_PRIORITY_CLASS};
+    SetPriorityClass(currProc, PriorityClassList[CVARS_GET_VALUE<int>("process_priority") % 3]);
+
+    // Process CPU affinity
+    if (CVARS_GET_VALUE<bool>("process_cpu_affinity"))
+        SetProcessAffinityMask(currProc, 1 << 0);
 }
 
 //
@@ -1835,6 +1847,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 +1876,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 +1942,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

@@ -40,7 +40,8 @@
 #define CORE_MTA_DISABLED_ALPHA     0.4f
 #define CORE_MTA_ENABLED_ALPHA      1.0f
 
-#define CORE_MTA_ANIMATION_TIME     200
+#define CORE_MTA_ANIMATION_TIME_IN  200
+#define CORE_MTA_ANIMATION_TIME_OUT 100
 #define CORE_MTA_MOVE_ANIM_TIME     600
 
 #define CORE_MTA_STATIC_BG          "cgui\\images\\background.png"
@@ -517,11 +518,9 @@ void CMainMenu::Update()
 
             if (m_pHoveredItem)
             {
-                float fProgress = (m_pHoveredItem->image->GetAlpha() - CORE_MTA_NORMAL_ALPHA) / (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA);
-                // Let's work out what the target progress should be by working out the time passed
-                fProgress = ((float)ulTimePassed / CORE_MTA_ANIMATION_TIME) * (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA) + fProgress;
+                float progress = m_pHoveredItem->animProgress + ((float)ulTimePassed / CORE_MTA_ANIMATION_TIME_IN);
                 MapRemove(m_unhoveredItems, m_pHoveredItem);
-                SetItemHoverProgress(m_pHoveredItem, fProgress, true);
+                SetItemHoverProgress(m_pHoveredItem, progress, true);
             }
         }
         else if (m_pHoveredItem)
@@ -534,11 +533,10 @@ void CMainMenu::Update()
         std::set<sMenuItem*>::iterator it = m_unhoveredItems.begin();
         while (it != m_unhoveredItems.end())
         {
-            float fProgress = ((*it)->image->GetAlpha() - CORE_MTA_NORMAL_ALPHA) / (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA);
             // Let's work out what the target progress should be by working out the time passed
             // Min of 0.5 progress fixes occasional graphical glitchekal
-            fProgress = fProgress - std::min(0.5f, ((float)ulTimePassed / CORE_MTA_ANIMATION_TIME) * (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA));
-            if (SetItemHoverProgress((*it), fProgress, false))
+            float newProgress = (*it)->animProgress - std::min(0.5f, ((float)ulTimePassed / CORE_MTA_ANIMATION_TIME_OUT) * (CORE_MTA_HOVER_ALPHA - CORE_MTA_NORMAL_ALPHA));
+            if (SetItemHoverProgress((*it), newProgress, false))
             {
                 std::set<sMenuItem*>::iterator itToErase = it++;
                 m_unhoveredItems.erase(itToErase);
@@ -778,6 +776,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)
         {
@@ -1098,8 +1099,10 @@ bool CMainMenu::SetItemHoverProgress(sMenuItem* pItem, float fProgress, bool bHo
 {
     fProgress = Clamp<float>(0, fProgress, 1);
 
-    // Use OutQuad equation for easing, or OutQuad for unhovering
-    fProgress = bHovering ? -fProgress * (fProgress - 2) : fProgress * fProgress;
+    pItem->animProgress = fProgress;
+
+    // Always use OutQuad for both hovering and unhovering, to avoid animation glitches.
+    fProgress = -fProgress * (fProgress - 2);
 
     // Work out the target scale
     float fTargetScale = (CORE_MTA_HOVER_SCALE - CORE_MTA_NORMAL_SCALE) * (fProgress) + CORE_MTA_NORMAL_SCALE;
@@ -1118,7 +1121,7 @@ bool CMainMenu::SetItemHoverProgress(sMenuItem* pItem, float fProgress, bool bHo
     pItem->image->SetSize(CVector2D(iSizeX, iSizeY), false);
 
     // Return whether the hovering has maxed out
-    return bHovering ? (fProgress == 1) : (fProgress == 0);
+    return bHovering ? (pItem->animProgress >= 1.0) : (pItem->animProgress <= 0.0f);
 }
 
 void CMainMenu::SetNewsHeadline(int iIndex, const SString& strHeadline, const SString& strDate, bool bIsNew)

Client/core/CMainMenu.h

@@ -33,6 +33,7 @@ struct sMenuItem
     int              nativeSizeX;
     int              nativeSizeY;
     CGUIStaticImage* image;
+    float            animProgress{};
 };
 
 class CMainMenu

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)
     {
@@ -165,13 +165,13 @@ bool CModManager::TryStart()
         DWORD size = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, errorCode,
                                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), reinterpret_cast<LPSTR>(&buffer), 0, nullptr);
 
-        if (size > 0)
+        if (buffer != nullptr && size > 0)
         {
-            LocalFree(buffer);
-
             std::string message{buffer, size};
             size_t      length = message.find_last_not_of("\t\n\v\f\r ");
 
+            LocalFree(buffer);
+
             if (length == std::string::npos)
                 return false;
 

Client/core/CSettings.cpp

@@ -405,6 +405,12 @@ void CSettings::CreateGUI()
     m_pCheckBoxAllowDiscordRPC->GetPosition(vecTemp, false);
     m_pCheckBoxAllowDiscordRPC->AutoSize(NULL, 20.0f);
 
+    // Enable camera photos getting saved to documents folder
+    m_pPhotoSavingCheckbox = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabMultiplayer, _("Save photos taken by camera weapon to GTA San Andreas User Files folder"), true));
+    m_pPhotoSavingCheckbox->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + 20.0f));
+    m_pPhotoSavingCheckbox->GetPosition(vecTemp, false);
+    m_pPhotoSavingCheckbox->AutoSize(NULL, 20.0f);
+
     m_pCheckBoxCustomizedSAFiles = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabMultiplayer, _("Use customized GTA:SA files"), true));
     m_pCheckBoxCustomizedSAFiles->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + 20.0f));
     m_pCheckBoxCustomizedSAFiles->GetPosition(vecTemp, false);
@@ -1201,10 +1207,10 @@ void CSettings::CreateGUI()
     m_pCachePathValue->AutoSize();
     vecTemp.fY += fLineHeight;
 
-    // Enable camera photos getting saved to documents folder
-    m_pPhotoSavingCheckbox = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabAdvanced, _("Save photos taken by camera weapon to GTA San Andreas User Files folder"), true));
-    m_pPhotoSavingCheckbox->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY));
-    m_pPhotoSavingCheckbox->AutoSize(NULL, 20.0f);
+    // Process affinity
+    m_pProcessAffinityCheckbox = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabAdvanced, _("Set CPU 0 affinity to improve game performance"), true));
+    m_pProcessAffinityCheckbox->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY));
+    m_pProcessAffinityCheckbox->AutoSize(nullptr, 20.0f);
     vecTemp.fY += fLineHeight;
 
     // Auto updater section label
@@ -1306,6 +1312,7 @@ void CSettings::CreateGUI()
     m_pButtonBrowserWhitelistRemove->SetClickHandler(GUI_CALLBACK(&CSettings::OnBrowserWhitelistRemove, this));
     m_pEditBrowserWhitelistAdd->SetActivateHandler(GUI_CALLBACK(&CSettings::OnBrowserWhitelistDomainAddFocused, this));
     m_pEditBrowserWhitelistAdd->SetDeactivateHandler(GUI_CALLBACK(&CSettings::OnBrowserWhitelistDomainAddDefocused, this));
+    m_pProcessAffinityCheckbox->SetClickHandler(GUI_CALLBACK(&CSettings::OnAffinityClick, this));
 
     // Set up the events for advanced description
     m_pPriorityLabel->SetMouseEnterHandler(GUI_CALLBACK(&CSettings::OnShowAdvancedSettingDescription, this));
@@ -1374,6 +1381,9 @@ void CSettings::CreateGUI()
     m_pUpdateAutoInstallCombo->SetMouseEnterHandler(GUI_CALLBACK(&CSettings::OnShowAdvancedSettingDescription, this));
     m_pUpdateAutoInstallCombo->SetMouseLeaveHandler(GUI_CALLBACK(&CSettings::OnHideAdvancedSettingDescription, this));
 
+    m_pProcessAffinityCheckbox->SetMouseEnterHandler(GUI_CALLBACK(&CSettings::OnShowAdvancedSettingDescription, this));
+    m_pProcessAffinityCheckbox->SetMouseLeaveHandler(GUI_CALLBACK(&CSettings::OnHideAdvancedSettingDescription, this));
+
     // Load Chat presets
     LoadChatPresets();
 
@@ -3228,6 +3238,22 @@ void CSettings::LoadData()
     CVARS_GET("photosaving", bVar);
     m_pPhotoSavingCheckbox->SetSelected(bVar);
 
+    // Process CPU Affinity
+    CVARS_GET("process_cpu_affinity", bVar);
+    m_pProcessAffinityCheckbox->SetSelected(bVar);
+
+    DWORD_PTR affinityMask = 0;
+    if (bVar)
+        affinityMask = 1 << 0; // CPU 0 only
+    else
+    {
+        SYSTEM_INFO sysInfo;
+        GetSystemInfo(&sysInfo);
+
+        affinityMask = (1 << sysInfo.dwNumberOfProcessors) - 1; // All cores (default)
+    }
+    SetProcessAffinityMask(GetCurrentProcess(), affinityMask);
+
     // Update build type
     CVARS_GET("update_build_type", iVar);
     if (iVar == 0 || iVar == 1)
@@ -3624,6 +3650,22 @@ void CSettings::SaveData()
     CVARS_SET("photosaving", photoSaving);
     CScreenShot::SetPhotoSavingInsideDocuments(photoSaving);
 
+    // Process CPU Affinity
+    bool cpuAffinity = m_pProcessAffinityCheckbox->GetSelected();
+    CVARS_SET("process_cpu_affinity", cpuAffinity);
+
+    DWORD_PTR affinityMask = 0;
+    if (cpuAffinity)
+        affinityMask = 1 << 0;  // CPU 0 only
+    else
+    {
+        SYSTEM_INFO sysInfo;
+        GetSystemInfo(&sysInfo);
+
+        affinityMask = (1 << sysInfo.dwNumberOfProcessors) - 1; // All cores (default)
+    }
+    SetProcessAffinityMask(GetCurrentProcess(), affinityMask);
+
     // Debug setting
     if (CGUIListItem* pSelected = m_pDebugSettingCombo->GetSelectedItem())
     {
@@ -4711,6 +4753,44 @@ static void DPIAwareQuestionCallBack(void* userdata, unsigned int uiButton)
     }
 }
 
+static void CPUAffinityQuestionCallBack(void* userdata, unsigned int button)
+{
+    CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->GetQuestionWindow()->Reset();
+
+    if (button == 0)
+    {
+        auto const checkBox = reinterpret_cast<CGUICheckBox*>(userdata);
+        checkBox->SetSelected(false);
+    }
+}
+
+bool CSettings::OnAffinityClick(CGUIElement* pElement)
+{
+    static bool shownWarning = false;
+
+    if (m_pProcessAffinityCheckbox->GetSelected() && !shownWarning)
+    {
+        shownWarning = true;
+
+        std::string message = std::string(
+            _("Enabling this setting may improve game performance, but on some processors, it may worsen it.\n"
+              "We have observed issues with AMD Ryzen processors featuring 3D V-Cache.\n"
+              "The exact list of affected processors is unknown.\n"
+              "\nAre you sure you  want to enable this option?"));
+
+        CQuestionBox* pQuestionBox = CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->GetQuestionWindow();
+        pQuestionBox->Reset();
+        pQuestionBox->SetTitle(_("EXPERIMENTAL FEATURE"));
+        pQuestionBox->SetMessage(message);
+        pQuestionBox->SetButton(0, _("No"));
+        pQuestionBox->SetButton(1, _("Yes"));
+        pQuestionBox->SetCallback(CPUAffinityQuestionCallBack, m_pProcessAffinityCheckbox);
+        pQuestionBox->Show();
+    }
+
+    return true;
+}
+
 bool CSettings::OnBrowserBlacklistAdd(CGUIElement* pElement)
 {
     SString strDomain = m_pEditBrowserBlacklistAdd->GetText();
@@ -4874,6 +4954,8 @@ bool CSettings::OnShowAdvancedSettingDescription(CGUIElement* pElement)
         strText = std::string(_("16-bit color:")) + " " + std::string(_("Enable 16 bit color modes - Requires MTA restart"));
     else if (pCheckBox && pCheckBox == m_pWin8MouseCheckBox)
         strText = std::string(_("Mouse fix:")) + " " + std::string(_("Mouse movement fix - May need PC restart"));
+    else if (pCheckBox && pCheckBox == m_pProcessAffinityCheckbox)
+        strText = std::string(_("CPU affinity:")) + " " + std::string(_("Experimental feature - It may improve performance or worsen it."));
 
     if (strText != "")
         m_pAdvancedSettingDescriptionLabel->SetText(strText.c_str());

Client/core/CSettings.h

@@ -216,6 +216,7 @@ class CSettings
     CGUICheckBox*  m_pWin8ColorCheckBox;
     CGUICheckBox*  m_pWin8MouseCheckBox;
     CGUICheckBox*  m_pPhotoSavingCheckbox;
+    CGUICheckBox*  m_pProcessAffinityCheckbox;
     CGUILabel*     m_pUpdateBuildTypeLabel;
     CGUIComboBox*  m_pUpdateBuildTypeCombo;
     CGUILabel*     m_pUpdateAutoInstallLabel;
@@ -406,6 +407,7 @@ class CSettings
     bool OnShowAdvancedSettingDescription(CGUIElement* pElement);
     bool OnHideAdvancedSettingDescription(CGUIElement* pElement);
     bool OnTabChanged(CGUIElement* pElement);
+    bool OnAffinityClick(CGUIElement* pElement);
     void ReloadBrowserLists();
 
 private:

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;
 }