Merge branch 'multitheftauto:master' into feature/2dfx

Author: FileEX

Client/core/CSettings.cpp

@@ -4765,34 +4765,39 @@ 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);
-    }
+    auto* checkbox = static_cast<CGUICheckBox*>(userdata);
+
+    if (!checkbox)
+        return;
+
+    if (button != 0)
+        return;
+
+    checkbox->SetSelected(true);
 }
 
 bool CSettings::OnAffinityClick(CGUIElement* pElement)
 {
-    static bool shownWarning = false;
+    static bool shown = false;
 
-    if (m_pProcessAffinityCheckbox->GetSelected() && !shownWarning)
-    {
-        shownWarning = true;
+    if (m_pProcessAffinityCheckbox->GetSelected() || shown)
+        return true;
 
-        std::string message = std::string(
-            _("This option should only be changed if you experience performance issues.\n"
-              "\nAre you sure you  want to enable this option?"));
+    shown = true;
 
-        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();
-    }
+    std::string title = _("EXPERIMENTAL FEATURE");
+    std::string message =
+        std::string(_("Disabling this option is not recommended unless you are experiencing performance issues.\n\n"
+                      "Are you sure you want to disable it?"));
+
+    CQuestionBox* pQuestionBox = CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->GetQuestionWindow();
+    pQuestionBox->Reset();
+    pQuestionBox->SetTitle(title);
+    pQuestionBox->SetMessage(message);
+    pQuestionBox->SetButton(0, _("No"));
+    pQuestionBox->SetButton(1, _("Yes"));
+    pQuestionBox->SetCallback(CPUAffinityQuestionCallBack, m_pProcessAffinityCheckbox);
+    pQuestionBox->Show();
 
     return true;
 }
@@ -4961,7 +4966,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 - Change only if you experience performance issues"));
+        strText = std::string(_("CPU affinity:")) + " " + std::string(_("Only change if you're having stability issues."));
 
     if (strText != "")
         m_pAdvancedSettingDescriptionLabel->SetText(strText.c_str());

Client/game_sa/CAnimManagerSA.cpp

@@ -874,12 +874,18 @@ const char* CAnimManagerSA::GetGateWayAnimationName() const
 
 bool CAnimManagerSA::IsValidGroup(std::uint32_t uiAnimGroup) const
 {
+    if ((eAnimGroup)uiAnimGroup <= eAnimGroup::ANIM_GROUP_NONE || (eAnimGroup)uiAnimGroup >= eAnimGroup::ANIM_TOTAL_GROUPS)
+        return false;
+
     const auto pGroup = GetAnimBlendAssoc(uiAnimGroup);
     return pGroup && pGroup->IsCreated();
 }
 
 bool CAnimManagerSA::IsValidAnim(std::uint32_t uiAnimGroup, std::uint32_t uiAnimID) const
 {
+    if ((eAnimID)uiAnimID <= eAnimID::ANIM_ID_UNDEFINED || (eAnimID)uiAnimID >= eAnimID::ANIM_ID_MAX)
+        return false;
+
     // We get an animation for the checks
     const auto pAnim = GetAnimStaticAssociation((eAnimGroup)uiAnimGroup, (eAnimID)uiAnimID);
     if (!pAnim)

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -2978,7 +2978,7 @@ void CClientPed::ApplyControllerStateFixes(CControllerState& Current)
             // Check we're not doing any important animations
             eAnimID animId = pAssoc->GetAnimID();
             if (animId == eAnimID::ANIM_ID_WALK || animId == eAnimID::ANIM_ID_RUN || animId == eAnimID::ANIM_ID_IDLE ||
-                animId == eAnimID::ANIM_ID_WEAPON_CROUCH || animId == eAnimID::ANIM_ID_STEALTH_AIM)
+                animId == eAnimID::ANIM_ID_WEAPON_CROUCH || animId == eAnimID::ANIM_ID_KILL_PARTIAL)
             {
                 // Are our knife anims loaded?
                 std::unique_ptr<CAnimBlock> pBlock = g_pGame->GetAnimManager()->GetAnimationBlock("KNIFE");

Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp

@@ -21,7 +21,7 @@ eAnimID _cdecl OnCAnimBlendAssocGroupCopyAnimation_FixBadAnim(eAnimGroup* pAnimG
     pMultiplayer->SetLastStaticAnimationPlayed(*pAnimGroup, *pAnimId, *(DWORD*)0xb4ea34);
 
     // Fix #1109: Weapon Fire ancient crash with anim ID 224
-    if (*pAnimId == eAnimID::ANIM_ID_WEAPON_FIRE && *pAnimGroup != eAnimGroup::ANIM_GROUP_GRENADE)
+    if (*pAnimId == eAnimID::ANIM_ID_FIRE && *pAnimGroup != eAnimGroup::ANIM_GROUP_GRENADE)
     {
         if (*pAnimGroup < eAnimGroup::ANIM_GROUP_PYTHON || *pAnimGroup > eAnimGroup::ANIM_GROUP_GOGGLES)
         {

Client/multiplayer_sa/CMultiplayerSA_FrameRateFixes.cpp

@@ -602,6 +602,7 @@ static void __declspec(naked) HOOK_CWeapon_Update()
         fmul st(0), st(1) // (m_timeToNextShootInMS - CTimer::m_snTimeInMilliseconds) * (timeStep / kOriginalTimeStep)
         fadd st(0), ebx // + m_snTimeInMilliseconds
         fistp [esi+10h]
+        fstp st(0)
 
         mov eax, ebx