Introduce isPedWearingJetpack

Author: qaisjp

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

@@ -26,6 +26,7 @@ void CLuaPedDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("getPedContactElement", GetPedContactElement);
     CLuaCFunctions::AddFunction("isPedInVehicle", IsPedInVehicle);
     CLuaCFunctions::AddFunction("doesPedHaveJetPack", DoesPedHaveJetPack);
+    CLuaCFunctions::AddFunction("isPedWearingJetpack", DoesPedHaveJetPack);            // introduced in 1.5.5-9.13176
     CLuaCFunctions::AddFunction("isPedOnGround", IsPedOnGround);
     CLuaCFunctions::AddFunction("getPedTask", GetPedTask);
     CLuaCFunctions::AddFunction("getPedSimplestTask", GetPedSimplestTask);
@@ -104,6 +105,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
 
     lua_classfunction(luaVM, "canBeKnockedOffBike", "canPedBeKnockedOffBike");
     lua_classfunction(luaVM, "doesHaveJetPack", "doesPedHaveJetPack");
+    lua_classfunction(luaVM, "isWearingJetpack", "isPedWearingJetpack");            // introduced in 1.5.5-9.13176
     lua_classfunction(luaVM, "getAmmoInClip", "getPedAmmoInClip");
     lua_classfunction(luaVM, "getAnalogControlState", "getPedAnalogControlState");
     lua_classfunction(luaVM, "getAnimation", "getPedAnimation");
@@ -170,6 +172,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classvariable(luaVM, "vehicleSeat", NULL, "getPedOccupiedVehicleSeat");
     lua_classvariable(luaVM, "canBeKnockedOffBike", "setPedCanBeKnockedOffBike", "canPedBeKnockedOffBike");
     lua_classvariable(luaVM, "hasJetPack", NULL, "doesPedHaveJetPack");
+    lua_classvariable(luaVM, "jetpack", NULL, "isPedWearingJetpack");            // introduced in 1.5.5-9.13176
     lua_classvariable(luaVM, "armor", NULL, "getPedArmor");
     lua_classvariable(luaVM, "cameraRotation", "setPedCameraRotation", "getPedCameraRotation");
     lua_classvariable(luaVM, "contactElement", NULL, "getPedContactElement");

Server/mods/deathmatch/logic/CResourceChecker.Data.h

@@ -166,6 +166,7 @@ namespace
         {"setElementCallPropagationEnabled", "1.3.5-9.06118"},
         {"isElementCallPropagationEnabled", "1.3.5-9.06118"},
         {"getResourceState", "1.3.5-9.06194"},
+        {"isPedWearingJetpack", "1.5.5-9.13176"},
     };
 
     SVersionItem serverFunctionInitList[] = {
@@ -242,6 +243,7 @@ namespace
         {"isElementCallPropagationEnabled", "1.3.5-9.06118"},
         {"resendPlayerACInfo", "1.5.1-9.07633"},
         {"dbPrepareString", "1.5.2"},
+        {"isPedWearingJetpack", "1.5.5-9.13176"},
     };
 
     //

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

@@ -31,6 +31,7 @@ void CLuaPedDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("getPedWeapon", GetPedWeapon);
     CLuaCFunctions::AddFunction("getPedClothes", GetPedClothes);
     CLuaCFunctions::AddFunction("doesPedHaveJetPack", DoesPedHaveJetPack);
+    CLuaCFunctions::AddFunction("isPedWearingJetpack", DoesPedHaveJetPack); // introduced in 1.5.5-9.13176
     CLuaCFunctions::AddFunction("isPedOnGround", IsPedOnGround);
     CLuaCFunctions::AddFunction("getPedFightingStyle", GetPedFightingStyle);
     CLuaCFunctions::AddFunction("getPedWalkingStyle", GetPedMoveAnim);
@@ -104,20 +105,19 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "isInWater", "isPedInWater");
     lua_classfunction(luaVM, "isOnGround", "isPedOnGround");
     lua_classfunction(luaVM, "isInVehicle", "isPedInVehicle");
-
     lua_classfunction(luaVM, "isOnFire", "isPedOnFire");
     lua_classfunction(luaVM, "isChoking", "isPedChoking");
     lua_classfunction(luaVM, "isDoingGangDriveby", "isPedDoingGangDriveby");
     lua_classfunction(luaVM, "isFrozen", "isPedFrozen");
     lua_classfunction(luaVM, "isHeadless", "isPedHeadless");
+    lua_classfunction(luaVM, "isWearingJetpack", "isPedWearingJetpack");            // introduced in 1.5.5-9.13176
 
     lua_classfunction(luaVM, "getArmor", "getPedArmor");
     lua_classfunction(luaVM, "getFightingStyle", "getPedFightingStyle");
     lua_classfunction(luaVM, "getGravity", "getPedGravity");
     lua_classfunction(luaVM, "getStat", "getPedStat");
     lua_classfunction(luaVM, "getWeaponSlot", "getPedWeaponSlot");
     lua_classfunction(luaVM, "getWalkingStyle", "getPedWalkingStyle");
-
     lua_classfunction(luaVM, "getAmmoInClip", "getPedAmmoInClip");
     lua_classfunction(luaVM, "getOccupiedVehicle", "getPedOccupiedVehicle");
     lua_classfunction(luaVM, "getWeapon", "getPedWeapon");
@@ -162,13 +162,10 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
                       GetPedOccupiedVehicle);                            // what about removePedFromVehicle?
     lua_classvariable(luaVM, "dead", "killPed", "isPedDead");            // Setting this to any value will still kill the ped. Should we special case this?
     lua_classvariable(luaVM, "walkingStyle", "setPedWalkingStyle", "getPedWalkingStyle");
-    lua_classvariable(luaVM, "jetpack", "setPedWearingJetpack", "doesPedHaveJetPack");
+    lua_classvariable(luaVM, "jetpack", "setPedWearingJetpack", "isPedWearingJetpack");            // introduced in 1.5.5-9.13176
     // lua_classvariable ( luaVM, "stats", "setPedStat", "getPedStat", CLuaOOPDefs::SetPedStat, CLuaOOPDefs::GetPedStat ); // table
     // lua_classvariable ( luaVM, "controlState", "setPedControlState", "getPedControlState", CLuaOOPDefs::SetPedControlState, CLuaOOPDefs::GetPedControlState
     // ); // TODO: .controlState["control"] = value
-    // This commented code will syntax error, a new method has to be implemented to support this
-    // lua_classvariable ( luaVM, "jetpack", {"removePedJetPack","givePedJetPack}, "doesPedHaveJetPack", CLuaOOPDefs::SetJetpackActive, "doesPedHaveJetPack" );
-    // // very specialised!
 
     lua_registerclass(luaVM, "Ped", "Element");
 }