Implement getPedOccupiedVehicleEnteringTo & fixes

Author: Xenius97

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

@@ -71,8 +71,6 @@ void CLuaCompatibilityDefs::LoadFunctions()
         {"getControlState", ArgumentParserWarn<false, CLuaPedDefs::GetPedControlState>},
         {"setCameraShakeLevel", ArgumentParserWarn<false, CLuaCameraDefs::SetCameraDrunkLevel>},
         {"getCameraShakeLevel", ArgumentParserWarn<false, CLuaCameraDefs::GetCameraDrunkLevel>},
-        {"isPedEnteringToVehicle", ArgumentParserWarn<false, CLuaPedDefs::IsPedEnteringToVehicle>},
-        {"isPedExitingFromVehicle", ArgumentParserWarn<false, CLuaPedDefs::IsPedExitingFromVehicle>},
     };
 
     // Add functions

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

@@ -104,6 +104,10 @@ void CLuaPedDefs::LoadFunctions()
         {"getPedTotalAmmo", GetPedTotalAmmo},
         {"getPedOccupiedVehicle", GetPedOccupiedVehicle},
         {"getPedOccupiedVehicleSeat", GetPedOccupiedVehicleSeat},
+        {"isPedEnteringToVehicle", ArgumentParser<IsPedEnteringToVehicle>},
+        {"isPedExitingFromVehicle", ArgumentParser<IsPedExitingFromVehicle>},
+        {"getPedOccupiedVehicleEnteringTo", ArgumentParser<GetPedOccupiedVehicleEnteringTo>},
+
         {"getPedBonePosition", GetPedBonePosition},
         {"getPedClothes", GetPedClothes},
         {"getPedMoveState", GetPedMoveState},
@@ -155,6 +159,7 @@ 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, "getOxygenLevel", "getPedOxygenLevel");
     lua_classfunction(luaVM, "getStat", "getPedStat");
     lua_classfunction(luaVM, "getTarget", "getPedTarget");
@@ -234,6 +239,9 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classvariable(luaVM, "ducked", NULL, "isPedDucked");
     lua_classvariable(luaVM, "headless", "setPedHeadless", "isPedHeadless");
     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, "onFire", "setPedOnFire", "isPedOnFire");
     lua_classvariable(luaVM, "onGround", NULL, "isPedOnGround");
     lua_classvariable(luaVM, "dead", NULL, "isPedDead");
@@ -2563,12 +2571,17 @@ void CLuaPedDefs::PlayPedVoiceLine(CClientPed* ped, int speechId, std::optional<
     ped->Say(speechContextId, probability.value_or(1.0f));
 }
 
-bool CLuaPedDefs::IsPedEnteringToVehicle(CClientPed* const ped)
+bool CLuaPedDefs::IsPedEnteringToVehicle(CClientPed* const ped) noexcept
 {
     return ped->IsEnteringToVehicle();
 }
 
-bool CLuaPedDefs::IsPedExitingFromVehicle(CClientPed* const ped)
+bool CLuaPedDefs::IsPedExitingFromVehicle(CClientPed* const ped) noexcept
 {
     return ped->IsExitingFromVehicle();
 }
+
+CClientVehicle* CLuaPedDefs::GetPedOccupiedVehicleEnteringTo(CClientPed* const ped)
+{
+    return ped->GetOccupyingVehicle();
+}

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

@@ -120,6 +120,7 @@ class CLuaPedDefs : public CLuaDefs
     static bool killPedTask(CClientPed* ped, taskType taskType, std::uint8_t taskNumber, std::optional<bool> gracefully);
 
     static void PlayPedVoiceLine(CClientPed* ped, int speechId, std::optional<float> probability);
-    static bool IsPedEnteringToVehicle(CClientPed* const ped);
-    static bool IsPedExitingFromVehicle(CClientPed* const ped);
+    static bool IsPedEnteringToVehicle(CClientPed* const ped) noexcept;
+    static bool IsPedExitingFromVehicle(CClientPed* const ped) noexcept;
+    static CClientVehicle* GetPedOccupiedVehicleEnteringTo(CClientPed* const ped);
 };

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

@@ -48,9 +48,9 @@ void CLuaPedDefs::LoadFunctions()
         {"getPedOccupiedVehicle", GetPedOccupiedVehicle},
         {"getPedOccupiedVehicleSeat", GetPedOccupiedVehicleSeat},
         {"isPedInVehicle", IsPedInVehicle},
-        {"isPedReloadingWeapon", ArgumentParser<IsPedReloadingWeapon>},
         {"isPedEnteringToVehicle", ArgumentParser<IsPedEnteringToVehicle>},
         {"isPedExitingFromVehicle", ArgumentParser<IsPedExitingFromVehicle>},
+        {"isPedReloadingWeapon", ArgumentParser<IsPedReloadingWeapon>},
 
         // Ped set functions
         {"setPedArmor", ArgumentParserWarn<false, SetPedArmor>},
@@ -157,6 +157,8 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "setWearingJetpack", "setPedWearingJetpack");            // introduced in 1.5.5-9.13846
 
     lua_classvariable(luaVM, "inVehicle", NULL, "isPedInVehicle");
+    lua_classvariable(luaVM, "enteringToVehicle", NULL, "isPedEnteringToVehicle");
+    lua_classvariable(luaVM, "exitingFromVehicle", NULL, "isPedExitingFromVehicle");
     lua_classvariable(luaVM, "ducked", NULL, "isPedDucked");
     lua_classvariable(luaVM, "inWater", NULL, "isPedInWater");
     lua_classvariable(luaVM, "onGround", NULL, "isPedOnGround");

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

@@ -80,6 +80,6 @@ class CLuaPedDefs : public CLuaDefs
     LUA_DECLARE(SetPedHeadless);
     LUA_DECLARE(SetPedFrozen);
     static bool ReloadPedWeapon(lua_State* vm, CPed* const ped) noexcept;
-    bool IsPedEnteringToVehicle(CPed* const ped) noexcept;
-    bool IsPedExitingFromVehicle(CPed* const ped) noexcept;
+    static bool IsPedEnteringToVehicle(CPed* const ped) noexcept;
+    static bool IsPedExitingFromVehicle(CPed* const ped) noexcept;
 };