Skip to content

Commit cd89726

Browse files
committed
Replace doesPedHaveJetPack with isPedWearingJetpack
1 parent d89a095 commit cd89726

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,9 @@ namespace
327327

328328
{false, "getComponentPosition", "will return 3 floats instead of a Vector3", "1.5.5-9.11710"},
329329
{false, "getComponentRotation", "will return 3 floats instead of a Vector3", "1.5.5-9.11710"},
330+
331+
// Ped jetpacks
332+
{false, "doesPedHaveJetPack", "isPedWearingJetpack"},
330333
};
331334

332335
SDeprecatedItem serverDeprecatedList[] = {
@@ -383,6 +386,7 @@ namespace
383386
{true, "removePlayerJetPack", "Please manually update this. Refer to the wiki for details"},
384387
{false, "givePedJetPack", "Please manually update this. Refer to the wiki for details"},
385388
{false, "removePedJetPack", "Please manually update this. Refer to the wiki for details"},
389+
{false, "doesPedHaveJetPack", "isPedWearingJetpack"},
386390
// XML
387391
{false, "xmlNodeGetSubNodes", "xmlNodeGetChildren"},
388392
{false, "xmlCreateSubNode", "xmlCreateChild"},

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void CLuaPedDefs::LoadFunctions(void)
3030
CLuaCFunctions::AddFunction("getPedTotalAmmo", GetPedTotalAmmo);
3131
CLuaCFunctions::AddFunction("getPedWeapon", GetPedWeapon);
3232
CLuaCFunctions::AddFunction("getPedClothes", GetPedClothes);
33-
CLuaCFunctions::AddFunction("doesPedHaveJetPack", DoesPedHaveJetPack);
33+
CLuaCFunctions::AddFunction("doesPedHaveJetPack", DoesPedHaveJetPack); // deprecated since 1.5.5-9.13176
3434
CLuaCFunctions::AddFunction("isPedWearingJetpack", DoesPedHaveJetPack); // introduced in 1.5.5-9.13176
3535
CLuaCFunctions::AddFunction("isPedOnGround", IsPedOnGround);
3636
CLuaCFunctions::AddFunction("getPedFightingStyle", GetPedFightingStyle);
@@ -53,9 +53,9 @@ void CLuaPedDefs::LoadFunctions(void)
5353
CLuaCFunctions::AddFunction("setPedStat", SetPedStat);
5454
CLuaCFunctions::AddFunction("addPedClothes", AddPedClothes);
5555
CLuaCFunctions::AddFunction("removePedClothes", RemovePedClothes);
56-
CLuaCFunctions::AddFunction("givePedJetPack", GivePedJetPack);
57-
CLuaCFunctions::AddFunction("removePedJetPack", RemovePedJetPack);
58-
CLuaCFunctions::AddFunction("setPedWearingJetpack", SetPedWearingJetpack);
56+
CLuaCFunctions::AddFunction("givePedJetPack", GivePedJetPack); // deprecated in 1.5.5-9.13176
57+
CLuaCFunctions::AddFunction("removePedJetPack", RemovePedJetPack); // deprecated in 1.5.5-9.13176
58+
CLuaCFunctions::AddFunction("setPedWearingJetpack", SetPedWearingJetpack); // introduced in 1.5.5-9.13176
5959
CLuaCFunctions::AddFunction("setPedFightingStyle", SetPedFightingStyle);
6060
CLuaCFunctions::AddFunction("setPedWalkingStyle", SetPedMoveAnim);
6161
CLuaCFunctions::AddFunction("setPedGravity", SetPedGravity);
@@ -97,8 +97,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
9797
lua_classfunction(luaVM, "removeClothes", "removePedClothes");
9898
lua_classfunction(luaVM, "removeFromVehicle", "removePedFromVehicle");
9999
lua_classfunction(luaVM, "removeJetPack", "removePedJetPack");
100-
lua_classfunction(luaVM, "doesHaveJetpack", "doesPedHaveJetPack");
101-
lua_classfunction(luaVM, "setWearingJetpack", "setPedWearingJetpack");
100+
lua_classfunction(luaVM, "doesHaveJetpack", "doesPedHaveJetPack"); // deprecated in 1.5.5-9.13176
102101

103102
lua_classfunction(luaVM, "isDead", "isPedDead");
104103
lua_classfunction(luaVM, "isDucked", "isPedDucked");
@@ -138,9 +137,9 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
138137
lua_classfunction(luaVM, "setStat", "setPedStat");
139138
lua_classfunction(luaVM, "setWeaponSlot", "setPedWeaponSlot");
140139
lua_classfunction(luaVM, "setWalkingStyle", "setPedWalkingStyle");
141-
142140
lua_classfunction(luaVM, "setAnimation", "setPedAnimation");
143141
lua_classfunction(luaVM, "setAnimationProgress", "setPedAnimationProgress");
142+
lua_classfunction(luaVM, "setWearingJetpack", "setPedWearingJetpack"); // introduced in 1.5.5-9.13176
144143

145144
lua_classvariable(luaVM, "inVehicle", NULL, "isPedInVehicle");
146145
lua_classvariable(luaVM, "ducked", NULL, "isPedDucked");

0 commit comments

Comments
 (0)