Merge branch 'master' into patch-6

Author: tederis

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/CCore.cpp

@@ -1795,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);
 }
 
 //

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/game_sa/TaskJumpFallSA.h

@@ -59,7 +59,7 @@ class CTaskSimpleClimbSA : public virtual CTaskSimpleSA, public virtual CTaskSim
 class CTaskSimpleJetPackSAInterface : public CTaskSimpleSAInterface
 {
 public:
-    unsigned char m_bIsFinished;
+    bool          m_bIsFinished;
     unsigned char m_bAddedIdleAnim;
     unsigned char m_bAnimsReferenced;
     unsigned char m_bAttackButtonPressed;
@@ -100,4 +100,6 @@ class CTaskSimpleJetPackSA : public virtual CTaskSimpleSA, public virtual CTaskS
 public:
     CTaskSimpleJetPackSA(){};
     CTaskSimpleJetPackSA(const CVector* pVecTargetPos, float fCruiseHeight = 10.0f, int nHoverTime = 0);
+
+    bool IsFinished() const override { return static_cast<const CTaskSimpleJetPackSAInterface*>(GetInterface())->m_bIsFinished; }
 };

Client/mods/deathmatch/logic/CClientDisplay.cpp

@@ -10,25 +10,14 @@
 
 #include <StdInc.h>
 
-CClientDisplay::CClientDisplay(CClientDisplayManager* pDisplayManager, unsigned long ulID)
+CClientDisplay::CClientDisplay(unsigned long ulID)
 {
-    m_pDisplayManager = pDisplayManager;
     m_ulID = ulID;
-
-    m_ulExpirationTime = 0;
     m_bVisible = true;
     m_Color = SColorRGBA(255, 255, 255, 255);
-
-    m_pDisplayManager->AddToList(this);
-}
-
-CClientDisplay::~CClientDisplay()
-{
-    // Remove us from the manager
-    m_pDisplayManager->RemoveFromList(this);
 }
 
 void CClientDisplay::SetColorAlpha(unsigned char ucAlpha)
 {
     m_Color.A = ucAlpha;
-}
+}

Client/mods/deathmatch/logic/CClientDisplay.h

@@ -22,20 +22,13 @@ enum eDisplayType
 
 class CClientDisplay
 {
-    friend class CClientDisplayManager;
-
 public:
-    CClientDisplay(class CClientDisplayManager* pDisplayManager, unsigned long ulID);
-    virtual ~CClientDisplay();
+    CClientDisplay(unsigned long ulID);
+    virtual ~CClientDisplay() = default;
 
-    unsigned long        GetID() { return m_ulID; }
+    unsigned long        GetID() const { return m_ulID; }
     virtual eDisplayType GetType() = 0;
 
-    unsigned long GetExpirationTime() { return m_ulExpirationTime; };
-    void          SetExpirationTime(unsigned long ulTime) { m_ulExpirationTime = ulTime; };
-    unsigned long GetTimeTillExpiration() { return m_ulExpirationTime - CClientTime::GetTime(); };
-    void          SetTimeTillExpiration(unsigned long ulMs) { m_ulExpirationTime = CClientTime::GetTime() + ulMs; };
-
     virtual const CVector& GetPosition() { return m_vecPosition; };
     virtual void           SetPosition(const CVector& vecPosition) { m_vecPosition = vecPosition; };
 
@@ -49,12 +42,7 @@ class CClientDisplay
     virtual void Render() = 0;
 
 protected:
-    bool IsExpired() { return (m_ulExpirationTime != 0 && (CClientTime::GetTime() > m_ulExpirationTime)); };
-
-    CClientDisplayManager* m_pDisplayManager;
-
     unsigned long m_ulID;
-    unsigned long m_ulExpirationTime;
     bool          m_bVisible;
     CVector       m_vecPosition;
     SColor        m_Color;

Client/mods/deathmatch/logic/CClientDisplayManager.cpp

@@ -12,27 +12,21 @@
 
 using std::list;
 
-CClientDisplayManager::CClientDisplayManager()
-{
-    // Init
-    m_bCanRemoveFromList = true;
-}
-
-CClientDisplayManager::~CClientDisplayManager()
-{
-    RemoveAll();
-}
-
-CClientDisplay* CClientDisplayManager::Get(unsigned long ulID)
+std::shared_ptr<CClientDisplay> CClientDisplayManager::Get(unsigned long ulID)
 {
     // Find the display with the given id
-    list<CClientDisplay*>::const_iterator iter = m_List.begin();
-    for (; iter != m_List.end(); iter++)
+    auto iter = m_List.begin();
+
+    for (; iter != m_List.end(); iter++) // Iterate weak_ptr list
     {
-        if ((*iter)->GetID() == ulID)
+        if (const auto& display = (*iter).lock())  // Make sure the shared_ptr still exists
         {
-            return *iter;
+            if (display->GetID() == ulID)
+            {
+                return display;
+            }
         }
+
     }
 
     return NULL;
@@ -49,57 +43,38 @@ void CClientDisplayManager::DrawText2D(const char* szCaption, const CVector& vec
                                        static_cast<int>(fResHeight), rgbaColor, szCaption, fScale, fScale, 0);
 }
 
-void CClientDisplayManager::AddToList(CClientDisplay* pDisplay)
+void CClientDisplayManager::AddToList(const std::shared_ptr<CClientDisplay>& display)
 {
-    m_List.push_back(pDisplay);
+    m_List.push_back(display);
 }
 
-void CClientDisplayManager::RemoveAll()
+void CClientDisplayManager::DoPulse()
 {
-    // Delete all the items in the list
-    m_bCanRemoveFromList = false;
-    list<CClientDisplay*>::iterator iter = m_List.begin();
-    for (; iter != m_List.end(); iter++)
-    {
-        delete *iter;
-    }
+    // Render all our displays
+    auto iter = m_List.begin();
 
-    // Clear the list
-    m_List.clear();
-    m_bCanRemoveFromList = true;
-}
+    // Clean up expired weak_ptr
+    m_List.remove_if([](const std::weak_ptr<CClientDisplay>& wp) { return wp.expired(); });
 
-void CClientDisplayManager::RemoveFromList(CClientDisplay* pDisplay)
-{
-    if (m_bCanRemoveFromList)
+    for (; iter != m_List.end(); iter++) // Iterate weak_ptr list
     {
-        if (!m_List.empty())
+        if (const auto& display = (*iter).lock())            // Make sure the shared_ptr still exists
         {
-            m_List.remove(pDisplay);
+            display->Render();
         }
     }
 }
 
-void CClientDisplayManager::DoPulse()
+std::shared_ptr<CClientVectorGraphicDisplay> CClientDisplayManager::CreateVectorGraphicDisplay(CClientVectorGraphic* svg)
 {
-    // Render all our displays
-    m_bCanRemoveFromList = false;
-    list<CClientDisplay*>::iterator iter = m_List.begin();
-    while (iter != m_List.end())
-    {
-        CClientDisplay* pObject = *iter;
-        if (pObject->IsExpired())
-        {
-            // Delete it and remove it from the list
-            delete pObject;
-            iter = m_List.erase(iter);
-        }
-        else
-        {
-            ++iter;
-            pObject->Render();
-        }
-    }
+    auto display = std::make_shared<CClientVectorGraphicDisplay>(svg);
+    AddToList(display);
+    return display;
+}
 
-    m_bCanRemoveFromList = true;
+std::shared_ptr<CClientTextDisplay> CClientDisplayManager::CreateTextDisplay(int ID)
+{
+    auto display = std::make_shared<CClientTextDisplay>(ID);
+    AddToList(display);
+    return display;
 }