Synchronize changes from 1.6 master branch [ci skip]

7be6d05 Add seat parameter to `setPedEnterVehicle` (#4573)
d061e11 Visual Studio Update

Author: github-actions[bot]

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -6530,25 +6530,19 @@ void CClientPed::UpdateStreamPosition(const CVector& vecInPosition)
 // Asks server for permission to start entering vehicle
 //
 //////////////////////////////////////////////////////////////////
-bool CClientPed::EnterVehicle(CClientVehicle* pVehicle, bool bPassenger)
+bool CClientPed::EnterVehicle(CClientVehicle* pVehicle, bool bPassenger, std::optional<unsigned int> optSeat)
 {
     // Are we local player or ped we are syncing
     if (!IsSyncing() && !IsLocalPlayer() && !IsLocalEntity())
-    {
         return false;
-    }
 
     // Are we already inside a vehicle
     if (GetOccupiedVehicle())
-    {
         return false;
-    }
 
     // We dead or in water?
     if (IsDead())
-    {
         return false;
-    }
 
     // Are we already sending an in/out request or not allowed to create a new in/out?
     if (m_bNoNewVehicleTask                                  // Are we permitted to even enter a vehicle?
@@ -6567,9 +6561,7 @@ bool CClientPed::EnterVehicle(CClientVehicle* pVehicle, bool bPassenger)
 
     // Streamed?
     if (!m_pPlayerPed)
-    {
         return false;
-    }
 
     unsigned int uiDoor = 0;
     // Do we want to enter a specific vehicle?
@@ -6594,43 +6586,31 @@ bool CClientPed::EnterVehicle(CClientVehicle* pVehicle, bool bPassenger)
 
     // Dead vehicle?
     if (pVehicle->GetHealth() <= 0.0f)
-    {
         return false;
-    }
 
+    // Stop if the vehicle is not enterable
     if (!pVehicle->IsEnterable(IsLocalEntity()))
-    {
-        // Stop if the vehicle is not enterable
         return false;
-    }
 
     // Stop if the ped is swimming and the vehicle model cannot be entered from water (fixes #1990)
     auto vehicleModel = static_cast<VehicleType>(pVehicle->GetModel());
 
     if (IsInWater() && !(vehicleModel == VehicleType::VT_SKIMMER || vehicleModel == VehicleType::VT_SEASPAR || vehicleModel == VehicleType::VT_LEVIATHN || vehicleModel == VehicleType::VT_VORTEX))
-    {
         return false;
-    }
 
     // If the Jump task is playing and we are in water - I know right
     // Kill the task.
     CTask* pTask = GetCurrentPrimaryTask();
     if (pTask && pTask->GetTaskType() == TASK_COMPLEX_JUMP)            // Kill jump task - breaks warp in entry and doesn't really matter
     {
-        if (pVehicle->IsInWater() ||
-            IsInWater())            // Make sure we are about to warp in (this bug only happens when someone jumps into water with a vehicle)
-        {
+        if (pVehicle->IsInWater() || IsInWater())            // Make sure we are about to warp in (this bug only happens when someone jumps into water with a vehicle)
             KillTask(3, true);            // Kill jump task if we are about to warp in
-        }
     }
 
     // Make sure we don't have any other primary tasks running, otherwise our 'enter-vehicle'
     // task will replace it and fuck it up!
     if (GetCurrentPrimaryTask())
-    {
-        // We already have a primary task, so stop.
         return false;
-    }
 
     if (IsClimbing()                       // Make sure we're not currently climbing
         || HasJetPack()                    // Make sure we don't have a jetpack
@@ -6641,17 +6621,31 @@ bool CClientPed::EnterVehicle(CClientVehicle* pVehicle, bool bPassenger)
         return false;
     }
 
-    unsigned int uiSeat = uiDoor;
-    if (bPassenger && uiDoor == 0)
+    // Determine seat - either explicitly specified or auto-determined from door/passenger flag
+    unsigned int uiSeat;
+
+    if (optSeat.has_value())
     {
-        // We're trying to enter as a passenger, yet our closest door
-        // is the driver's door. Force an enter for the passenger seat.
-        uiSeat = 1;
+        // Explicit seat specified
+        uiSeat = optSeat.value();
+        if (!CClientVehicleManager::IsValidSeat(pVehicle->GetModel(), static_cast<unsigned char>(uiSeat)))
+            return false;
     }
-    else if (!bPassenger)
+    else
     {
-        // We want to drive. Force our seat to the driver's seat.
-        uiSeat = 0;
+        // Legacy behavior - auto-determine seat from door/passenger flag
+        uiSeat = uiDoor;
+        if (bPassenger && uiDoor == 0)
+        {
+            // We're trying to enter as a passenger, yet our closest door
+            // is the driver's door. Force an enter for the passenger seat.
+            uiSeat = 1;
+        }
+        else if (!bPassenger)
+        {
+            // We want to drive. Force our seat to the driver's seat.
+            uiSeat = 0;
+        }
     }
 
     // If the vehicle's a boat, make sure we're standing on it (we need a dif task to enter boats properly)

Client/mods/deathmatch/logic/CClientPed.h

@@ -609,7 +609,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
 public:
     void _GetIntoVehicle(CClientVehicle* pVehicle, unsigned int uiSeat, unsigned char ucDoor);
     // Used to control and sync entering/exiting
-    bool EnterVehicle(CClientVehicle* pVehicle, bool bPassenger);
+    bool EnterVehicle(CClientVehicle* pVehicle, bool bPassenger, std::optional<unsigned int> optSeat = std::nullopt);
     bool ExitVehicle();
     void ResetVehicleInOut();
     void UpdateVehicleInOut();

Client/mods/deathmatch/logic/CClientVehicleManager.cpp

@@ -486,6 +486,24 @@ unsigned char CClientVehicleManager::GetMaxPassengerCount(unsigned long ulModel)
     return 0xFF;
 }
 
+bool CClientVehicleManager::IsValidSeat(unsigned long ulModel, unsigned char ucSeat)
+{
+    // Camper only has 3 seats (0-2)
+    if (static_cast<VehicleType>(ulModel) == VehicleType::VT_CAMPER && ucSeat > 2)
+        return false;
+
+    // Get the maximum passenger count for the vehicle
+    unsigned char ucMaxPassengers = GetMaxPassengerCount(ulModel);
+    if (ucSeat > ucMaxPassengers)
+        return false;
+
+    // Vehicles with unknown passenger count (255) can only have driver in seat 0
+    if (ucSeat > 0 && ucMaxPassengers == 255)
+        return false;
+
+    return true;
+}
+
 void CClientVehicleManager::GetRandomVariation(unsigned short usModel, unsigned char& ucVariant, unsigned char& ucVariant2)
 {
     RandomizeRandomSeed();

Client/mods/deathmatch/logic/CClientVehicleManager.h

@@ -50,6 +50,7 @@ class CClientVehicleManager
     static bool HasDamageModel(unsigned long ulModel);
     static bool HasDamageModel(enum eClientVehicleType Type);
     static bool HasDoors(unsigned long ulModel);
+    static bool IsValidSeat(unsigned long ulModel, unsigned char ucSeat);
 
     bool Exists(CClientVehicle* pVehicle);
 

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -9963,8 +9963,7 @@ bool CStaticFunctionDefinitions::WarpPedIntoVehicle(CClientPed* pPed, CClientVeh
     if (pPed->IsLocalEntity() != pVehicle->IsLocalEntity())
         return false;
 
-    // Camper only has 3 seats (0-2)
-    if (static_cast<VehicleType>(pVehicle->GetModel()) == VehicleType::VT_CAMPER && uiSeat > 2)
+    if (!CClientVehicleManager::IsValidSeat(pVehicle->GetModel(), static_cast<unsigned char>(uiSeat)))
         return false;
 
     if (pPed->IsLocalEntity())
@@ -9977,14 +9976,6 @@ bool CStaticFunctionDefinitions::WarpPedIntoVehicle(CClientPed* pPed, CClientVeh
         if (pPed->IsDead() || pVehicle->GetHealth() <= 0.0f)
             return false;
 
-        // Valid seat id for that vehicle?
-        uchar ucMaxPassengers = CClientVehicleManager::GetMaxPassengerCount(pVehicle->GetModel());
-        if (uiSeat > ucMaxPassengers)
-            return false;
-
-        if (uiSeat > 0 && ucMaxPassengers == 255)
-            return false;
-
         // Toss the previous player out of it if neccessary
         if (CClientPed* pPreviousOccupant = pVehicle->GetOccupant(uiSeat))
             RemovePedFromVehicle(pPreviousOccupant);

Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp

@@ -2518,11 +2518,28 @@ int CLuaPedDefs::DetonateSatchels(lua_State* luaVM)
     return 1;
 }
 
-bool CLuaPedDefs::SetPedEnterVehicle(CClientPed* pPed, std::optional<CClientVehicle*> pOptVehicle, std::optional<bool> bOptPassenger)
+bool CLuaPedDefs::SetPedEnterVehicle(CClientPed* pPed, std::optional<CClientVehicle*> pOptVehicle, std::optional<std::variant<bool, unsigned int>> seatOrPassenger)
 {
     CClientVehicle* pVehicle = pOptVehicle.value_or(nullptr);
-    bool            bPassenger = bOptPassenger.value_or(false);
-    return pPed->EnterVehicle(pVehicle, bPassenger);
+    bool            bPassenger = false;
+    std::optional<unsigned int> optSeat;
+
+    // Parse third argument: either a bool (passenger flag) or int (seat number)
+    if (seatOrPassenger.has_value())
+    {
+        if (std::holds_alternative<bool>(seatOrPassenger.value()))
+        {
+            // Third argument is bool - treat as passenger flag
+            bPassenger = std::get<bool>(seatOrPassenger.value());
+        }
+        else if (std::holds_alternative<unsigned int>(seatOrPassenger.value()))
+        {
+            // Third argument is int - treat as seat number
+            optSeat = std::get<unsigned int>(seatOrPassenger.value());
+        }
+    }
+
+    return pPed->EnterVehicle(pVehicle, bPassenger, optSeat);
 }
 
 bool CLuaPedDefs::SetPedExitVehicle(CClientPed* pPed)

Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.h

@@ -112,7 +112,7 @@ class CLuaPedDefs : public CLuaDefs
     LUA_DECLARE(RemovePedFromVehicle);
     LUA_DECLARE(SetPedOxygenLevel);
     LUA_DECLARE(SetPedStat);
-    static bool SetPedEnterVehicle(CClientPed* pPed, std::optional<CClientVehicle*> pOptVehicle, std::optional<bool> bOptPassenger);
+    static bool SetPedEnterVehicle(CClientPed* pPed, std::optional<CClientVehicle*> pOptVehicle, std::optional<std::variant<bool, unsigned int>> seatOrPassenger);
     static bool SetPedExitVehicle(CClientPed* pPed);
     static bool IsPedBleeding(CClientPed* ped);
     static bool SetPedBleeding(CClientPed* ped, bool bleeding);