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

Author: W3lac3

.github/workflows/crowdin-auto-merge.yml

@@ -28,4 +28,4 @@ jobs:
             git push origin --delete l10n/master
           fi
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.POT_CI_PAT }}

Client/core/CClientVariables.cpp

@@ -357,7 +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
+    DEFAULT("process_cpu_affinity", true);                                            // Set CPU 0 affinity to improve game performance and fix the known issue in single-threaded games
 
     if (!Exists("locale"))
     {

Client/core/CCore.cpp

@@ -1770,43 +1770,44 @@ void CCore::OnPostColorFilterRender()
 void CCore::ApplyCoreInitSettings()
 {
 #if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN)
-    const auto aware = CVARS_GET_VALUE<bool>("process_dpi_aware");
+    bool aware = CVARS_GET_VALUE<bool>("process_dpi_aware");
 
+    // The minimum supported client for the function below is Windows Vista (Longhorn).
+    // For more information, refer to the Microsoft Learn article:
+    // https://learn.microsoft.com/en-us/windows/win32/hidpi/high-dpi-desktop-application-development-on-windows
     if (aware)
         SetProcessDPIAware();
 #endif
 
-    const auto revision = GetApplicationSettingInt("reset-settings-revision");
+    int revision = GetApplicationSettingInt("reset-settings-revision");
 
-    if (revision >= 21486)
-        return;
-
-    const auto skin = CVARS_GET_VALUE<std::string>("current_skin");
+    // Users with the default skin will be switched to the 2023 version by replacing "Default" with "Default 2023".
+    // The "Default 2023" GUI skin was introduced in commit 2d9e03324b07e355031ecb3263477477f1a91399.
+    if (revision < 21486)
+    {
+        auto skin = CVARS_GET_VALUE<std::string>("current_skin");
 
-    if (skin == "Default")
-        CVARS_SET("current_skin", "Default 2023");
+        if (skin == "Default")
+            CVARS_SET("current_skin", "Default 2023");
 
-    SetApplicationSettingInt("reset-settings-revision", 21486);
+        SetApplicationSettingInt("reset-settings-revision", 21486);
+    }
 
-    const auto process = GetCurrentProcess();
-    const int  priorities[] = {NORMAL_PRIORITY_CLASS, ABOVE_NORMAL_PRIORITY_CLASS, HIGH_PRIORITY_CLASS};
-    const auto priority = CVARS_GET_VALUE<int>("process_priority") % 3;
+    HANDLE process = GetCurrentProcess();
+    const int priorities[] = {NORMAL_PRIORITY_CLASS, ABOVE_NORMAL_PRIORITY_CLASS, HIGH_PRIORITY_CLASS};
+    int priority = CVARS_GET_VALUE<int>("process_priority") % 3;
 
     SetPriorityClass(process, priorities[priority]);
 
-    const auto affinity = CVARS_GET_VALUE<bool>("process_cpu_affinity");
-
+    bool affinity = CVARS_GET_VALUE<bool>("process_cpu_affinity");
     if (!affinity)
         return;
 
     DWORD_PTR mask;
     DWORD_PTR sys;
-    const auto result = GetProcessAffinityMask(process, &mask, &sys);
-
-    if (!result)
-        return;
-
-    SetProcessAffinityMask(process, mask & ~1);
+    BOOL result = GetProcessAffinityMask(process, &mask, &sys);
+    if (result)
+        SetProcessAffinityMask(process, mask & ~1);
 }
 
 //

Client/core/CSettings.cpp

@@ -3245,13 +3245,11 @@ void CSettings::LoadData()
     DWORD_PTR mask;
     DWORD_PTR sys;
 
-    const auto process = GetCurrentProcess();
-    const auto result = GetProcessAffinityMask(process, &mask, &sys);
+    HANDLE process = GetCurrentProcess();
+    BOOL result = GetProcessAffinityMask(process, &mask, &sys);
 
     if (bVar && result)
-    {
         SetProcessAffinityMask(process, mask & ~1);
-    }
     else
     {
         SYSTEM_INFO info;
@@ -3657,19 +3655,17 @@ void CSettings::SaveData()
     CScreenShot::SetPhotoSavingInsideDocuments(photoSaving);
 
     // Process CPU Affinity
-    const auto affinity = m_pProcessAffinityCheckbox->GetSelected();
+    bool affinity = m_pProcessAffinityCheckbox->GetSelected();
     CVARS_SET("process_cpu_affinity", affinity);
 
     DWORD_PTR mask;
     DWORD_PTR sys;
 
-    const auto process = GetCurrentProcess();
-    const auto result = GetProcessAffinityMask(process, &mask, &sys);
+    HANDLE process = GetCurrentProcess();
+    BOOL result = GetProcessAffinityMask(process, &mask, &sys);
 
     if (affinity && result)
-    {
         SetProcessAffinityMask(process, mask & ~1);
-    }
     else
     {
         SYSTEM_INFO info;
@@ -4785,9 +4781,7 @@ bool CSettings::OnAffinityClick(CGUIElement* pElement)
         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"
+            _("This option should only be changed if you experience performance issues.\n"
               "\nAre you sure you  want to enable this option?"));
 
         CQuestionBox* pQuestionBox = CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->GetQuestionWindow();
@@ -4967,7 +4961,7 @@ bool CSettings::OnShowAdvancedSettingDescription(CGUIElement* pElement)
     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."));
+        strText = std::string(_("CPU affinity:")) + " " + std::string(_("Experimental feature - Change only if you experience performance issues"));
 
     if (strText != "")
         m_pAdvancedSettingDescriptionLabel->SetText(strText.c_str());

Client/mods/deathmatch/logic/CClientMarker.cpp

@@ -447,7 +447,7 @@ void CClientMarker::CreateOfType(int iType)
             CClientCheckpoint* pCheckpoint = new CClientCheckpoint(this);
             pCheckpoint->SetCheckpointType(CClientCheckpoint::TYPE_NORMAL);
             m_pMarker = pCheckpoint;
-            m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;
@@ -458,7 +458,7 @@ void CClientMarker::CreateOfType(int iType)
             CClientCheckpoint* pCheckpoint = new CClientCheckpoint(this);
             pCheckpoint->SetCheckpointType(CClientCheckpoint::TYPE_RING);
             m_pMarker = pCheckpoint;
-            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;
@@ -469,7 +469,7 @@ void CClientMarker::CreateOfType(int iType)
             CClient3DMarker* p3DMarker = new CClient3DMarker(this);
             p3DMarker->Set3DMarkerType(CClient3DMarker::TYPE_CYLINDER);
             m_pMarker = p3DMarker;
-            m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;
@@ -480,7 +480,7 @@ void CClientMarker::CreateOfType(int iType)
             CClient3DMarker* p3DMarker = new CClient3DMarker(this);
             p3DMarker->Set3DMarkerType(CClient3DMarker::TYPE_ARROW);
             m_pMarker = p3DMarker;
-            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;
@@ -489,7 +489,7 @@ void CClientMarker::CreateOfType(int iType)
         case MARKER_CORONA:
         {
             m_pMarker = new CClientCorona(this);
-            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), NULL, vecOrigin, GetSize());
+            m_pCollision = new CClientColSphere(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());
             m_pCollision->m_pOwningMarker = this;
             m_pCollision->SetHitCallback(this);
             break;

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -1016,12 +1016,12 @@ void CClientPed::SetTargetTarget(unsigned long ulDelay, const CVector& vecSource
         float fRadius = DistanceBetweenPoints3D(m_vecTargetSource, m_vecTargetTarget);
 
         // Grab the angle of the source vector and the angle of the target vector relative to the source vector that applies
-        m_vecBeginTargetAngle.fX = acos((m_vecBeginTarget.fX - m_vecBeginSource.fX) / fRadius);
-        m_vecBeginTargetAngle.fY = acos((m_vecBeginTarget.fY - m_vecBeginSource.fY) / fRadius);
-        m_vecBeginTargetAngle.fZ = acos((m_vecBeginTarget.fZ - m_vecBeginSource.fZ) / fRadius);
-        m_vecTargetTargetAngle.fX = acos((m_vecTargetTarget.fX - m_vecTargetSource.fX) / fRadius);
-        m_vecTargetTargetAngle.fY = acos((m_vecTargetTarget.fY - m_vecTargetSource.fY) / fRadius);
-        m_vecTargetTargetAngle.fZ = acos((m_vecTargetTarget.fZ - m_vecTargetSource.fZ) / fRadius);
+        m_vecBeginTargetAngle.fX = acos(Clamp(-1.0f, (m_vecBeginTarget.fX - m_vecBeginSource.fX) / fRadius, 1.0f));
+        m_vecBeginTargetAngle.fY = acos(Clamp(-1.0f, (m_vecBeginTarget.fY - m_vecBeginSource.fY) / fRadius, 1.0f));
+        m_vecBeginTargetAngle.fZ = acos(Clamp(-1.0f, (m_vecBeginTarget.fZ - m_vecBeginSource.fZ) / fRadius, 1.0f));
+        m_vecTargetTargetAngle.fX = acos(Clamp(-1.0f, (m_vecTargetTarget.fX - m_vecTargetSource.fX) / fRadius, 1.0f));
+        m_vecTargetTargetAngle.fY = acos(Clamp(-1.0f, (m_vecTargetTarget.fY - m_vecTargetSource.fY) / fRadius, 1.0f));
+        m_vecTargetTargetAngle.fZ = acos(Clamp(-1.0f, (m_vecTargetTarget.fZ - m_vecTargetSource.fZ) / fRadius, 1.0f));
 
         // Grab the angle to interpolate and make sure it's below pi and above -pi (shortest path of interpolation)
         m_vecTargetInterpolateAngle = m_vecTargetTargetAngle - m_vecBeginTargetAngle;