Add setPedJetPack

multitheftauto · Jul 19, 2018 · c4c12fc · c4c12fc
1 parent 49e0ce4
commit c4c12fc
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 2 deletions.
diff --git a/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp
@@ -21,6 +21,7 @@ void CPedRPCs::LoadFunctions(void)
     AddHandler(SET_PED_ROTATION, SetPedRotation, "SetPedRotation");
     AddHandler(GIVE_PED_JETPACK, GivePedJetPack, "GivePedJetPack");
     AddHandler(REMOVE_PED_JETPACK, RemovePedJetPack, "RemovePedJetPack");
+    AddHandler(SET_PED_JETPACK, SetPedJetPack, "SetPedJetPack");
     AddHandler(REMOVE_PED_CLOTHES, RemovePedClothes, "RemovePedClothes");
     AddHandler(SET_PED_GRAVITY, SetPedGravity, "SetPedGravity");
     AddHandler(SET_PED_CHOKING, SetPedChoking, "SetPedChoking");
@@ -100,6 +101,19 @@ void CPedRPCs::RemovePedJetPack(CClientEntity* pSource, NetBitStreamInterface& b
     }
 }
 
+void CPedRPCs::SetPedJetPack(CClientEntity* pSource, NetBitStreamInterface& bitStream)
+{
+    bool bJetPack;
+    if (bitStream.ReadBit(bJetPack))
+    {
+        CClientPed* pPed = m_pPedManager->Get(pSource->GetID(), true);
+        if (pPed)
+        {
+            pPed->SetHasJetPack(bJetPack);
+        }
+    }
+}
+
 void CPedRPCs::RemovePedClothes(CClientEntity* pSource, NetBitStreamInterface& bitStream)
 {
     unsigned char ucType;

diff --git a/Client/mods/deathmatch/logic/rpc/CPedRPCs.h b/Client/mods/deathmatch/logic/rpc/CPedRPCs.h
@@ -23,6 +23,7 @@ class CPedRPCs : public CRPCFunctions
     DECLARE_ELEMENT_RPC(SetPedRotation);
     DECLARE_ELEMENT_RPC(GivePedJetPack);
     DECLARE_ELEMENT_RPC(RemovePedJetPack);
+    DECLARE_ELEMENT_RPC(SetPedJetPack);
     DECLARE_ELEMENT_RPC(RemovePedClothes);
     DECLARE_ELEMENT_RPC(SetPedGravity);
     DECLARE_ELEMENT_RPC(SetPedChoking);
@@ -39,4 +40,4 @@ class CPedRPCs : public CRPCFunctions
     DECLARE_ELEMENT_RPC(ReloadPedWeapon);
 };
 
-#endif
+#endif
diff --git a/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp
@@ -42,6 +42,7 @@ ADD_ENUM1(SET_PED_ARMOR)
 ADD_ENUM1(SET_PED_ROTATION)
 ADD_ENUM1(GIVE_PED_JETPACK)
 ADD_ENUM1(REMOVE_PED_JETPACK)
+ADD_ENUM1(SET_PED_JETPACK)
 ADD_ENUM1(REMOVE_PED_CLOTHES)
 ADD_ENUM1(SET_PED_GRAVITY)
 ADD_ENUM1(SET_PED_CHOKING)

diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -3898,6 +3898,29 @@ bool CStaticFunctionDefinitions::RemovePedJetPack(CElement* pElement)
     return false;
 }
 
+bool CStaticFunctionDefinitions::SetPedJetPack(CElement* pElement, bool bJetPack)
+{
+    assert(pElement);
+    RUN_CHILDREN(SetPedJetPack(*iter, bJetPack))
+
+        if (IS_PED(pElement))
+        {
+            CPed* pPed = static_cast<CPed*>(pElement);
+            if (pPed->IsSpawned() && bJetPack != pPed->HasJetPack())
+            {
+                pPed->SetHasJetPack(bJetPack);
+
+                CBitStream BitStream;
+                BitStream.pBitStream->WriteBit(bJetPack);
+                m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, SET_PED_JETPACK, *BitStream.pBitStream));
+
+                return true;
+            }
+        }
+
+    return false;
+}
+
 bool CStaticFunctionDefinitions::SetPedFightingStyle(CElement* pElement, unsigned char ucStyle)
 {
     assert(pElement);

diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/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 SetPedJetPack(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);

diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp
@@ -54,6 +54,7 @@ void CLuaPedDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("removePedClothes", RemovePedClothes);
     CLuaCFunctions::AddFunction("givePedJetPack", GivePedJetPack);
     CLuaCFunctions::AddFunction("removePedJetPack", RemovePedJetPack);
+    CLuaCFunctions::AddFunction("setPedJetPack", SetPedJetPack);
     CLuaCFunctions::AddFunction("setPedFightingStyle", SetPedFightingStyle);
     CLuaCFunctions::AddFunction("setPedWalkingStyle", SetPedMoveAnim);
     CLuaCFunctions::AddFunction("setPedGravity", SetPedGravity);
@@ -96,6 +97,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "removeFromVehicle", "removePedFromVehicle");
     lua_classfunction(luaVM, "removeJetPack", "removePedJetPack");
     lua_classfunction(luaVM, "doesHaveJetpack", "doesPedHaveJetPack");
+    lua_classfunction(luaVM, "setJetPack", "setPedJetPack");
 
     lua_classfunction(luaVM, "isDead", "isPedDead");
     lua_classfunction(luaVM, "isDucked", "isPedDucked");
@@ -1238,6 +1240,32 @@ int CLuaPedDefs::RemovePedJetPack(lua_State* luaVM)
     return 1;
 }
 
+int CLuaPedDefs::SetPedJetPack(lua_State* luaVM)
+{
+    CElement* pElement;
+    bool      bJetPack;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pElement);
+    argStream.ReadBool(bJetPack);
+
+    if (!argStream.HasErrors())
+    {
+        LogWarningIfPlayerHasNotJoinedYet(luaVM, pElement);
+
+        if (CStaticFunctionDefinitions::SetPedJetPack(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;

diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.h b/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(SetPedJetPack);
     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);
-};
+};
diff --git a/Shared/sdk/net/rpc_enums.h b/Shared/sdk/net/rpc_enums.h
@@ -45,6 +45,7 @@ enum eElementRPCFunctions
     SET_PED_ROTATION,
     GIVE_PED_JETPACK,
     REMOVE_PED_JETPACK,
+    SET_PED_JETPACK,
     REMOVE_PED_CLOTHES,
     SET_PED_GRAVITY,
     SET_PED_CHOKING,