Merge branch 'master' into client_c20

Author: G-Moris

Client/core/CKeyBinds.cpp

@@ -841,7 +841,8 @@ CCommandBind* CKeyBinds::FindCommandMatch(const char* szKey, const char* szComma
     NullEmptyStrings(szKey, szArguments, szResource, szOriginalScriptKey);
 
     std::string arguments = szArguments ? szArguments : "";
-    szArguments = SharedUtil::Trim(arguments.data());
+    if (!arguments.empty())
+        szArguments = SharedUtil::Trim(arguments.data());
 
     for (KeyBindPtr& bind : m_binds)
     {

Client/game_sa/CPoolsSA.cpp

@@ -128,6 +128,8 @@ CVehicle* CPoolsSA::AddVehicle(CClientVehicle* pClientVehicle, eVehicleTypes eVe
         {
             pVehicle->m_ucVariant = ucVariation;
             pVehicle->m_ucVariant2 = ucVariation2;
+
+            pVehicle->DumpVehicleFrames();
         }
         else
         {

Client/game_sa/CVehicleSA.cpp

@@ -186,12 +186,6 @@ void CVehicleSA::Init()
     }
 
     CopyGlobalSuspensionLinesToPrivate();
-
-    // clear our rw frames list
-    m_ExtraFrames.clear();
-    // dump the frames
-    VehicleDump(this);
-    FinalizeFramesList();
 }
 
 CVehicleSA::~CVehicleSA()
@@ -1949,6 +1943,7 @@ void CVehicleSA::AddComponent(RwFrame* pFrame, bool bReadOnly)
     // if the frame is invalid we don't want to be here
     if (!pFrame)
         return;
+
     // if the frame already exists ignore it
     if (IsComponentPresent(pFrame->szName) || pFrame->szName == "")
         return;
@@ -1957,23 +1952,22 @@ void CVehicleSA::AddComponent(RwFrame* pFrame, bool bReadOnly)
     // variants have no name field.
     if (strName == "")
     {
+        // In MTA variant 255 means no variant
+        if ((m_ucVariantCount == 0 && m_ucVariant == 255) || (m_ucVariantCount == 1 && m_ucVariant2 == 255))
+            return;
+
         // name starts with extra
         strName = "extra_";
-        if (m_ucVariantCount == 0)
-        {
-            // variants are extra_a, extra_b and so on
-            strName += ('a' - 1) + m_ucVariant;
-        }
-        if (m_ucVariantCount == 1)
-        {
-            // variants are extra_a, extra_b and so on
-            strName += ('a' - 1) + m_ucVariant2;
-        }
+
+        // variants are extra_a - extra_f
+        strName += 'a' + (m_ucVariantCount == 0 ? m_ucVariant : m_ucVariant2);
+
         // increment the variant count ( we assume that the first variant created is variant1 and the second is variant2 )
         m_ucVariantCount++;
     }
-    SVehicleFrame frame = SVehicleFrame(pFrame, bReadOnly);
+
     // insert our new frame
+    SVehicleFrame frame = SVehicleFrame(pFrame, bReadOnly);
     m_ExtraFrames.insert(std::pair<SString, SVehicleFrame>(strName, frame));
 }
 
@@ -2001,6 +1995,16 @@ void CVehicleSA::FinalizeFramesList()
     }
 }
 
+void CVehicleSA::DumpVehicleFrames()
+{
+    // clear our rw frames list
+    m_ExtraFrames.clear();
+
+    // dump the frames
+    VehicleDump(this);
+    FinalizeFramesList();
+}
+
 bool CVehicleSA::SetComponentVisible(const SString& vehicleComponent, bool bRequestVisible)
 {
     SVehicleFrame* pComponent = GetVehicleComponent(vehicleComponent);

Client/game_sa/CVehicleSA.h

@@ -687,4 +687,5 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
     void           CopyGlobalSuspensionLinesToPrivate();
     SVehicleFrame* GetVehicleComponent(const SString& vehicleComponent);
     void           FinalizeFramesList();
+    void           DumpVehicleFrames();
 };

utils/buildactions/install_cef.lua

@@ -9,8 +9,8 @@ local CEF_URL_PREFIX = "https://cef-builds.spotifycdn.com/cef_binary_"
 local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"
 
 -- Change here to update CEF version
-local CEF_VERSION = "127.3.4+ge9e2e14+chromium-127.0.6533.100"
-local CEF_HASH = "621a2ddf02b81441f7b87214dcdcf1bb35401b646c9750807692e45d9818d174"
+local CEF_VERSION = "127.3.5+g114ea2a+chromium-127.0.6533.120"
+local CEF_HASH = "ad91d535873bdd2b6f36135d42a383f92ab2f2959be33db0a6f0f4178cf49436"
 
 function make_cef_download_url()
 	return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX