Merge branch 'master' into client_c20

Author: G-Moris

Client/game_sa/CVehicleSA.cpp

@@ -1592,9 +1592,10 @@ bool CVehicleSA::SpawnFlyingComponent(const eCarNodes& nodeIndex, const eCarComp
     if (removalTime <= -1 || !componentObject)
         return true;
 
-    std::uint32_t CTimer_ms = *reinterpret_cast<std::uint32_t*>(VAR_CTimer_snTimeInMilliseconds);
-    componentObject->uiObjectRemovalTime = CTimer_ms + static_cast<std::uint32_t>(removalTime);
+    // Set double-sided
+    componentObject->bBackfaceCulled = true;
 
+    componentObject->uiObjectRemovalTime = pGame->GetSystemTime() + static_cast<std::uint32_t>(removalTime);
     return true;
 }
 

Client/game_sa/CVehicleSA.h

@@ -106,8 +106,6 @@ struct RwTexture;
 #define OFFSET_CBike_Nodes 0x5A0
 #define OFFSET_CBoat_Nodes 0x5B0
 
-#define VAR_CTimer_snTimeInMilliseconds 0xB7CB84
-
 struct SRailNodeSA
 {
     short sX;                       // x coordinate times 8

Client/mods/deathmatch/logic/CClientPad.cpp

@@ -336,11 +336,9 @@ bool CClientPad::GetControlState(const char* szName, CControllerState& State, bo
                     return State.LeftShoulder2 == 255;
                     break;            // zoom out
                 case 9:
-                    return false;
-                    break;            // enter_exit
+                    return State.ButtonTriangle == 255; // enter_exit
                 case 10:
-                    return false;
-                    break;            // change_cam
+                    return State.Select == 255; // change_cam
                 case 11:
                     return State.ButtonSquare == 255;
                     break;            // jump
@@ -432,8 +430,7 @@ bool CClientPad::GetControlState(const char* szName, CControllerState& State, bo
                     return State.RightShoulder2 == 255;
                     break;            // look right
                 case 33:
-                    return false;
-                    break;            // look behind
+                    return State.LeftShoulder2 == 255 && State.RightShoulder2 == 255; // look behind
                 case 34:
                     return false;
                     break;            // mouse look

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -1394,6 +1394,10 @@ void CClientPed::WarpIntoVehicle(CClientVehicle* pVehicle, unsigned int uiSeat)
         }
     }
 
+    // Wrong seat or undefined passengers count?
+    if ((uiSeat > 0 && uiSeat > pVehicle->m_ucMaxPassengers) || (uiSeat > 0 && pVehicle->m_ucMaxPassengers == 255))
+        return;
+
     // Transfer WaitingForGroundToLoad state to vehicle
     if (m_bIsLocalPlayer)
     {

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -2656,7 +2656,12 @@ void CClientVehicle::Create()
         {
             if (m_pPassengers[i])
             {
-                m_pPassengers[i]->WarpIntoVehicle(this, i + 1);
+                // Undefined passengers count?
+                if (m_ucMaxPassengers != 255)
+                    m_pPassengers[i]->WarpIntoVehicle(this, i + 1);
+                else
+                    m_pPassengers[i]->SetWarpInToVehicleRequired(false);
+
                 if (m_pPassengers[i])
                     m_pPassengers[i]->StreamIn(true);
             }

Server/mods/deathmatch/logic/CResource.cpp

@@ -1465,44 +1465,55 @@ bool CResource::ReadIncludedHTML(CXMLNode* pRoot)
 
             if (!strFilename.empty())
             {
-                std::string strFullFilename;
                 ReplaceSlashes(strFilename);
 
-                if (IsFilenameUsed(strFilename, false))
+                if (!IsValidFilePath(strFilename.c_str()))
                 {
-                    CLogger::LogPrintf("WARNING: Duplicate html file in resource '%s': '%s'\n", m_strResourceName.c_str(), strFilename.c_str());
+                    m_strFailureReason = SString("Couldn't find html %s for resource %s\n", strFilename.c_str(), m_strResourceName.c_str());
+                    CLogger::ErrorPrintf(m_strFailureReason);
+                    return false;
                 }
 
-                // Try to find the file
-                if (IsValidFilePath(strFilename.c_str()) && GetFilePath(strFilename.c_str(), strFullFilename))
+                std::vector<std::string> vecFiles = GetFilePaths(strFilename.c_str());
+                if (vecFiles.empty())
                 {
-                    // This one is supposed to be default, but there's already a default page
-                    if (bFoundDefault && bIsDefault)
+                    if (glob::has_magic(strFilename))
                     {
-                        CLogger::LogPrintf("Only one html item can be default per resource, ignoring %s in %s\n", strFilename.c_str(),
-                                           m_strResourceName.c_str());
-                        bIsDefault = false;
+                        m_ResourceFilesCountPerDir[strFilename] = vecFiles.size();
+                        continue;
                     }
 
-                    // If this is supposed to be default, we've now found our default page
-                    if (bIsDefault)
-                        bFoundDefault = true;
-
-                    // Create a new resource HTML file and add it to the list
-                    auto pResourceFile = new CResourceHTMLItem(this, strFilename.c_str(), strFullFilename.c_str(), &Attributes, bIsDefault, bIsRaw,
-                                                               bIsRestricted, m_bOOPEnabledInMetaXml);
-                    m_ResourceFiles.push_back(pResourceFile);
-
-                    // This is the first HTML file? Remember it
-                    if (!pFirstHTML)
-                        pFirstHTML = pResourceFile;
-                }
-                else
-                {
                     m_strFailureReason = SString("Couldn't find html %s for resource %s\n", strFilename.c_str(), m_strResourceName.c_str());
                     CLogger::ErrorPrintf(m_strFailureReason);
                     return false;
                 }
+
+                for (const std::string& strFilePath : vecFiles)
+                {
+                    std::string strFullFilename;
+
+                    if (GetFilePath(strFilePath.c_str(), strFullFilename))
+                    {
+                        // This one is supposed to be default, but there's already a default page
+                        if (bFoundDefault && bIsDefault)
+                        {
+                            CLogger::LogPrintf("Only one html item can be default per resource, ignoring %s in %s\n", strFilename.c_str(), m_strResourceName.c_str());
+                            bIsDefault = false;
+                        }
+
+                        // If this is supposed to be default, we've now found our default page
+                        if (bIsDefault)
+                            bFoundDefault = true;
+
+                        // Create a new resource HTML file and add it to the list
+                        auto pResourceFile = new CResourceHTMLItem(this, strFilename.c_str(), strFullFilename.c_str(), &Attributes, bIsDefault, bIsRaw, bIsRestricted, m_bOOPEnabledInMetaXml);
+                        m_ResourceFiles.push_back(pResourceFile);
+
+                        // This is the first HTML file? Remember it
+                        if (!pFirstHTML)
+                            pFirstHTML = pResourceFile;
+                    }
+                }
             }
             else
             {

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 = "129.0.11+g57354b8+chromium-129.0.6668.90"
-local CEF_HASH = "a3e3e7add2235d1865a8570522ff87dba392e7b2d15bca0983ed2ebe19ea048b"
+local CEF_VERSION = "129.0.12+gf09539f+chromium-129.0.6668.101"
+local CEF_HASH = "ec759dbfafafac2ae26f4960caad1c8464205a7787ec247e0fc21ab4620c8a5c"
 
 function make_cef_download_url()
 	return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX