Merge pull request #243 from Dezash/feature/setPedJetPack

Function setPedWearingJetpack

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");

Client/mods/deathmatch/logic/rpc/CPedRPCs.h

@@ -9,8 +9,7 @@
  *
  *****************************************************************************/
 
-#ifndef __CPedRPCs_H
-#define __CPedRPCs_H
+#pragma once
 
 #include "CRPCFunctions.h"
 
@@ -38,5 +37,3 @@ class CPedRPCs : public CRPCFunctions
     DECLARE_ELEMENT_RPC(SetPedFrozen);
     DECLARE_ELEMENT_RPC(ReloadPedWeapon);
 };
-
-#endif

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,8 @@ namespace
         {"isElementCallPropagationEnabled", "1.3.5-9.06118"},
         {"resendPlayerACInfo", "1.5.1-9.07633"},
         {"dbPrepareString", "1.5.2"},
+        {"isPedWearingJetpack", "1.5.5-9.13176"},
+        {"setPedWearingJetpack", "1.5.5-9.13176"},
     };
 
     //
@@ -250,7 +253,12 @@ namespace
 
     struct SDeprecatedItem
     {
+        // bRemoved does not mean:
+        //     "has this function been removed yet?"
+        // bRemoved actually means:
+        //     "is not rename?" (you can't rename removed functions)
         bool    bRemoved;
+
         SString strOldName;
         SString strNewName;
         SString strVersion;
@@ -324,6 +332,9 @@ namespace
 
         {false, "getComponentPosition", "will return 3 floats instead of a Vector3", "1.5.5-9.11710"},
         {false, "getComponentRotation", "will return 3 floats instead of a Vector3", "1.5.5-9.11710"},
+
+        // Ped jetpacks
+        {false, "doesPedHaveJetPack", "isPedWearingJetpack"},
     };
 
     SDeprecatedItem serverDeprecatedList[] = {
@@ -367,8 +378,6 @@ namespace
         {false, "setPlayerStat", "setPedStat"},
         {false, "addPlayerClothes", "addPedClothes"},
         {false, "removePlayerClothes", "removePedClothes"},
-        {false, "givePlayerJetPack", "givePedJetPack"},
-        {false, "removePlayerJetPack", "removePedJetPack"},
         {false, "setPlayerFightingStyle", "setPedFightingStyle"},
         {false, "setPlayerGravity", "setPedGravity"},
         {false, "setPlayerChoking", "setPedChoking"},
@@ -377,6 +386,12 @@ namespace
         {false, "attachElementToElement", "attachElements"},
         {false, "detachElementFromElement", "detachElements"},
         {false, "showPlayerHudComponent", "setPlayerHudComponentVisible"},
+        // Server ped jetpack
+        {true, "givePlayerJetPack", "Replaced with setPedWearingJetpack. Refer to the wiki for details"},
+        {true, "removePlayerJetPack", "Replaced with setPedWearingJetpack. Refer to the wiki for details"},
+        {false, "givePedJetPack", "Replaced with setPedWearingJetpack. Refer to the wiki for details"},
+        {false, "removePedJetPack", "Replaced with setPedWearingJetpack. Refer to the wiki for details"},
+        {false, "doesPedHaveJetPack", "isPedWearingJetpack"},
         // XML
         {false, "xmlNodeGetSubNodes", "xmlNodeGetChildren"},
         {false, "xmlCreateSubNode", "xmlCreateChild"},

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -3902,6 +3902,28 @@ bool CStaticFunctionDefinitions::RemovePedJetPack(CElement* pElement)
     return false;
 }
 
+bool CStaticFunctionDefinitions::SetPedWearingJetpack(CElement* pElement, bool bJetPack)
+{
+    assert(pElement);
+    RUN_CHILDREN(SetPedWearingJetpack(*iter, bJetPack))
+
+    if (IS_PED(pElement))
+    {
+        CPed* pPed = static_cast<CPed*>(pElement);
+        if (pPed->IsSpawned() && bJetPack != pPed->HasJetPack())
+        {
+            pPed->SetHasJetPack(bJetPack);
+
+            CBitStream BitStream;
+            m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, bJetPack ? GIVE_PED_JETPACK : REMOVE_PED_JETPACK, *BitStream.pBitStream));
+
+            return true;
+        }
+    }
+
+    return false;
+}
+
 bool CStaticFunctionDefinitions::SetPedFightingStyle(CElement* pElement, unsigned char ucStyle)
 {
     assert(pElement);

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -186,6 +186,7 @@ class CStaticFunctionDefinitions
     static bool RemovePedClothes(CElement* pElement, unsigned char ucType, const char* szTexture = NULL, const char* szModel = NULL);
     static bool GivePedJetPack(CElement* pElement);
     static bool RemovePedJetPack(CElement* pElement);
+    static bool SetPedWearingJetpack(CElement* pElement, bool bJetPack);
     static bool SetPedFightingStyle(CElement* pElement, unsigned char ucStyle);
     static bool SetPedMoveAnim(CElement* pElement, unsigned int iMoveAnim);
     static bool SetPedGravity(CElement* pElement, float fGravity);

Server/mods/deathmatch/logic/lua/CLuaManager.cpp

@@ -375,5 +375,9 @@ void CLuaManager::LoadCFunctions(void)
     CLuaCFunctions::AddFunction("xmlFindSubNode", CLuaXMLDefs::xmlNodeFindChild);
     CLuaCFunctions::AddFunction("attachElementToElement", CLuaElementDefs::attachElements);
     CLuaCFunctions::AddFunction("detachElementFromElement", CLuaElementDefs::detachElements);
+    // Deprecated since 1.5.5-9.13176
+    CLuaCFunctions::AddFunction("doesPedHaveJetPack", CLuaPedDefs::DoesPedHaveJetPack);
+    CLuaCFunctions::AddFunction("givePedJetPack", CLuaPedDefs::GivePedJetPack);
+    CLuaCFunctions::AddFunction("removePedJetPack", CLuaPedDefs::RemovePedJetPack);
     // ** END OF BACKWARDS COMPATIBILITY FUNCS. **
 }

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

@@ -30,7 +30,7 @@ void CLuaPedDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("getPedTotalAmmo", GetPedTotalAmmo);
     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);
@@ -52,8 +52,7 @@ void CLuaPedDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("setPedStat", SetPedStat);
     CLuaCFunctions::AddFunction("addPedClothes", AddPedClothes);
     CLuaCFunctions::AddFunction("removePedClothes", RemovePedClothes);
-    CLuaCFunctions::AddFunction("givePedJetPack", GivePedJetPack);
-    CLuaCFunctions::AddFunction("removePedJetPack", RemovePedJetPack);
+    CLuaCFunctions::AddFunction("setPedWearingJetpack", SetPedWearingJetpack); // introduced in 1.5.5-9.13176
     CLuaCFunctions::AddFunction("setPedFightingStyle", SetPedFightingStyle);
     CLuaCFunctions::AddFunction("setPedWalkingStyle", SetPedMoveAnim);
     CLuaCFunctions::AddFunction("setPedGravity", SetPedGravity);
@@ -95,27 +94,26 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "removeClothes", "removePedClothes");
     lua_classfunction(luaVM, "removeFromVehicle", "removePedFromVehicle");
     lua_classfunction(luaVM, "removeJetPack", "removePedJetPack");
-    lua_classfunction(luaVM, "doesHaveJetpack", "doesPedHaveJetPack");
+    lua_classfunction(luaVM, "doesHaveJetpack", "doesPedHaveJetPack"); // deprecated in 1.5.5-9.13176
 
     lua_classfunction(luaVM, "isDead", "isPedDead");
     lua_classfunction(luaVM, "isDucked", "isPedDucked");
     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");
@@ -136,9 +134,9 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "setStat", "setPedStat");
     lua_classfunction(luaVM, "setWeaponSlot", "setPedWeaponSlot");
     lua_classfunction(luaVM, "setWalkingStyle", "setPedWalkingStyle");
-
     lua_classfunction(luaVM, "setAnimation", "setPedAnimation");
     lua_classfunction(luaVM, "setAnimationProgress", "setPedAnimationProgress");
+    lua_classfunction(luaVM, "setWearingJetpack", "setPedWearingJetpack");            // introduced in 1.5.5-9.13176
 
     lua_classvariable(luaVM, "inVehicle", NULL, "isPedInVehicle");
     lua_classvariable(luaVM, "ducked", NULL, "isPedDucked");
@@ -160,12 +158,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", "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");
 }
@@ -1238,6 +1234,32 @@ int CLuaPedDefs::RemovePedJetPack(lua_State* luaVM)
     return 1;
 }
 
+int CLuaPedDefs::SetPedWearingJetpack(lua_State* luaVM)
+{
+    CElement* pElement;
+    bool      bJetPack;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pElement);
+    argStream.ReadBool(bJetPack);
+
+    if (!argStream.HasErrors())
+    {
+        LogWarningIfPlayerHasNotJoinedYet(luaVM, pElement);
+
+        if (CStaticFunctionDefinitions::SetPedWearingJetpack(pElement, bJetPack))
+        {
+            lua_pushboolean(luaVM, true);
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 int CLuaPedDefs::SetPedFightingStyle(lua_State* luaVM)
 {
     CElement*     pElement;

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

@@ -63,6 +63,7 @@ class CLuaPedDefs : public CLuaDefs
     LUA_DECLARE(RemovePedClothes);
     LUA_DECLARE(GivePedJetPack);
     LUA_DECLARE(RemovePedJetPack);
+    LUA_DECLARE(SetPedWearingJetpack);
     LUA_DECLARE(SetPedFightingStyle);
     LUA_DECLARE(SetPedMoveAnim);
     LUA_DECLARE(SetPedGravity);
@@ -77,4 +78,4 @@ class CLuaPedDefs : public CLuaDefs
     LUA_DECLARE(SetPedHeadless);
     LUA_DECLARE(SetPedFrozen);
     LUA_DECLARE(reloadPedWeapon);
-};
+};