Skip to content

Commit cf1eb95

Browse files
committed
Merge branch 'feature/setPedJetPack' of https://github.com/Dezash/mtasa-blue into feature/setPedJetpack
2 parents 1a68197 + 564d1e9 commit cf1eb95

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,5 +375,9 @@ void CLuaManager::LoadCFunctions(void)
375375
CLuaCFunctions::AddFunction("xmlFindSubNode", CLuaXMLDefs::xmlNodeFindChild);
376376
CLuaCFunctions::AddFunction("attachElementToElement", CLuaElementDefs::attachElements);
377377
CLuaCFunctions::AddFunction("detachElementFromElement", CLuaElementDefs::detachElements);
378+
// Deprecated since 1.5.5-9.13176
379+
CLuaCFunctions::AddFunction("doesPedHaveJetPack", CLuaPedDefs::DoesPedHaveJetPack);
380+
CLuaCFunctions::AddFunction("givePedJetPack", CLuaPedDefs::GivePedJetPack);
381+
CLuaCFunctions::AddFunction("removePedJetPack", CLuaPedDefs::RemovePedJetPack);
378382
// ** END OF BACKWARDS COMPATIBILITY FUNCS. **
379383
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ void CLuaPedDefs::LoadFunctions(void)
3030
CLuaCFunctions::AddFunction("getPedTotalAmmo", GetPedTotalAmmo);
3131
CLuaCFunctions::AddFunction("getPedWeapon", GetPedWeapon);
3232
CLuaCFunctions::AddFunction("getPedClothes", GetPedClothes);
33-
CLuaCFunctions::AddFunction("doesPedHaveJetPack", DoesPedHaveJetPack); // deprecated since 1.5.5-9.13176
3433
CLuaCFunctions::AddFunction("isPedWearingJetpack", DoesPedHaveJetPack); // introduced in 1.5.5-9.13176
3534
CLuaCFunctions::AddFunction("isPedOnGround", IsPedOnGround);
3635
CLuaCFunctions::AddFunction("getPedFightingStyle", GetPedFightingStyle);
@@ -53,8 +52,6 @@ void CLuaPedDefs::LoadFunctions(void)
5352
CLuaCFunctions::AddFunction("setPedStat", SetPedStat);
5453
CLuaCFunctions::AddFunction("addPedClothes", AddPedClothes);
5554
CLuaCFunctions::AddFunction("removePedClothes", RemovePedClothes);
56-
CLuaCFunctions::AddFunction("givePedJetPack", GivePedJetPack); // deprecated in 1.5.5-9.13176
57-
CLuaCFunctions::AddFunction("removePedJetPack", RemovePedJetPack); // deprecated in 1.5.5-9.13176
5855
CLuaCFunctions::AddFunction("setPedWearingJetpack", SetPedWearingJetpack); // introduced in 1.5.5-9.13176
5956
CLuaCFunctions::AddFunction("setPedFightingStyle", SetPedFightingStyle);
6057
CLuaCFunctions::AddFunction("setPedWalkingStyle", SetPedMoveAnim);

0 commit comments

Comments
 (0)