Finalize all functions

Author: Xenius97

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -127,7 +127,7 @@ void CClientPed::Init(CClientManager* pManager, unsigned long ulModelID, bool bI
     m_pTaskManager = NULL;
     m_pOccupiedVehicle = NULL;
     m_pOccupyingVehicle = NULL;
-    // m_uiOccupyingSeat = 0;
+    m_uiOccupyingSeat = 0;
     m_uiOccupiedVehicleSeat = 0xFF;
     m_bHealthLocked = false;
     m_bDontChangeRadio = false;
@@ -1464,7 +1464,7 @@ void CClientPed::WarpIntoVehicle(CClientVehicle* pVehicle, unsigned int uiSeat)
     CClientVehicle* pPrevVehicle = GetRealOccupiedVehicle();
     // Eventually remove us from a previous vehicle
     RemoveFromVehicle();
-    // m_uiOccupyingSeat = uiSeat;
+    m_uiOccupyingSeat = uiSeat;
     m_bForceGettingIn = false;
     m_bForceGettingOut = false;
     m_ucLeavingDoor = 0xFF;

Client/mods/deathmatch/logic/CClientPed.h

@@ -254,6 +254,8 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     CClientVehicle*       GetOccupyingVehicle() noexcept { return m_pOccupyingVehicle; };
     const CClientVehicle* GetOccupyingVehicle() const noexcept { return m_pOccupyingVehicle; };
 
+    unsigned int GetOccupyingVehicleSeat() const noexcept { return m_uiOccupyingSeat; };
+
     CClientVehicle* GetRealOccupiedVehicle();
     CClientVehicle* GetClosestEnterableVehicle(bool bGetPositionFromClosestDoor, bool bCheckDriverDoor, bool bCheckPassengerDoors,
                                                bool bCheckStreamedOutVehicles, unsigned int* uiClosestDoor = NULL, CVector* pClosestDoorPosition = NULL,
@@ -647,7 +649,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     unsigned long               m_ulLastOnScreenTime;
     CClientVehiclePtr           m_pOccupiedVehicle;
     CClientVehiclePtr           m_pOccupyingVehicle;
-    // unsigned int                m_uiOccupyingSeat;
+    unsigned int                m_uiOccupyingSeat;
     unsigned int      m_uiOccupiedVehicleSeat;
     bool              m_bForceGettingIn;
     bool              m_bForceGettingOut;

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -4139,8 +4139,7 @@ void CClientVehicle::SetPedOccupyingVehicle(CClientPed* pClientPed, CClientVehic
 
     // Ped vars
     pClientPed->m_pOccupyingVehicle = pVehicle;
-    //  if ( uiSeat >= 0 && uiSeat < 8 )
-    //      pClientPed->m_uiOccupyingSeat = uiSeat;
+    pClientPed->m_uiOccupyingSeat = uiSeat;
 
     if (ucDoor != 0xFF)
         pVehicle->AllowDoorRatioSetting(ucDoor, false);
@@ -4266,7 +4265,7 @@ void CClientVehicle::UnpairPedAndVehicle(CClientPed* pClientPed, CClientVehicle*
     {
         INFO(("UnpairPedAndVehicle: pClientPed:%s from m_pOccupyingVehicle:0x%08x", GetPlayerName(pClientPed).c_str(), pVehicle));
         pClientPed->m_pOccupyingVehicle = NULL;
-        // pClientPed->m_uiOccupyingSeat = 0xFF;
+        pClientPed->m_uiOccupyingSeat = NULL;
     }
 }
 

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

@@ -106,7 +106,8 @@ void CLuaPedDefs::LoadFunctions()
         {"getPedOccupiedVehicleSeat", GetPedOccupiedVehicleSeat},
         {"isPedEnteringToVehicle", ArgumentParser<IsPedEnteringToVehicle>},
         {"isPedExitingFromVehicle", ArgumentParser<IsPedExitingFromVehicle>},
-        {"getPedOccupiedVehicleEnteringTo", ArgumentParser<GetPedOccupiedVehicleEnteringTo>},
+        {"getPedVehicleEnteringTo", ArgumentParser<GetPedVehicleEnteringTo>},
+        {"getPedVehicleEnteringToSeat", ArgumentParser<GetPedVehicleEnteringToSeat>},
 
         {"getPedBonePosition", GetPedBonePosition},
         {"getPedClothes", GetPedClothes},
@@ -159,7 +160,8 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "getMoveState", "getPedMoveState");
     lua_classfunction(luaVM, "getOccupiedVehicle", "getPedOccupiedVehicle");
     lua_classfunction(luaVM, "getOccupiedVehicleSeat", "getPedOccupiedVehicleSeat");
-    lua_classfunction(luaVM, "getOccupiedVehicleEnteringTo", "getPedOccupiedVehicleEnteringTo");
+    lua_classfunction(luaVM, "getVehicleEnteringTo", "getPedVehicleEnteringTo");
+    lua_classfunction(luaVM, "getVehicleEnteringToSeat", "getPedVehicleEnteringToSeat");
     lua_classfunction(luaVM, "getOxygenLevel", "getPedOxygenLevel");
     lua_classfunction(luaVM, "getStat", "getPedStat");
     lua_classfunction(luaVM, "getTarget", "getPedTarget");
@@ -241,7 +243,8 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classvariable(luaVM, "inVehicle", NULL, "isPedInVehicle");
     lua_classvariable(luaVM, "enteringToVehicle", NULL, "isPedEnteringToVehicle");
     lua_classvariable(luaVM, "exitingFromVehicle", NULL, "isPedExitingFromVehicle");
-    lua_classvariable(luaVM, "occupiedVehicleEnteringTo", NULL, "getPedOccupiedVehicleEnteringTo");
+    lua_classvariable(luaVM, "vehicleEnteringTo", NULL, "getPedVehicleEnteringTo");
+    lua_classvariable(luaVM, "vehicleEnteringToSeat", NULL, "getPedVehicleEnteringToSeat");
     lua_classvariable(luaVM, "onFire", "setPedOnFire", "isPedOnFire");
     lua_classvariable(luaVM, "onGround", NULL, "isPedOnGround");
     lua_classvariable(luaVM, "dead", NULL, "isPedDead");
@@ -2581,7 +2584,12 @@ bool CLuaPedDefs::IsPedExitingFromVehicle(CClientPed* const ped) noexcept
     return ped->IsExitingFromVehicle();
 }
 
-CClientVehicle* CLuaPedDefs::GetPedOccupiedVehicleEnteringTo(CClientPed* const ped)
+CClientVehicle* CLuaPedDefs::GetPedVehicleEnteringTo(CClientPed* const ped)
 {
     return ped->GetOccupyingVehicle();
 }
+
+int CLuaPedDefs::GetPedVehicleEnteringToSeat(CClientPed* const ped)
+{
+    return ped->GetOccupyingVehicleSeat();
+}

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

@@ -122,5 +122,6 @@ class CLuaPedDefs : public CLuaDefs
     static void PlayPedVoiceLine(CClientPed* ped, int speechId, std::optional<float> probability);
     static bool IsPedEnteringToVehicle(CClientPed* const ped) noexcept;
     static bool IsPedExitingFromVehicle(CClientPed* const ped) noexcept;
-    static CClientVehicle* GetPedOccupiedVehicleEnteringTo(CClientPed* const ped);
+    static CClientVehicle* GetPedVehicleEnteringTo(CClientPed* const ped);
+    static int GetPedVehicleEnteringToSeat(CClientPed* const ped);
 };