Skip to content

Commit 6a75800

Browse files
ccw808ccw808
committed
Fixed build number for new jetpack functions
1 parent 86a9e34 commit 6a75800

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void CLuaPedDefs::LoadFunctions(void)
2626
CLuaCFunctions::AddFunction("getPedContactElement", GetPedContactElement);
2727
CLuaCFunctions::AddFunction("isPedInVehicle", IsPedInVehicle);
2828
CLuaCFunctions::AddFunction("doesPedHaveJetPack", DoesPedHaveJetPack);
29-
CLuaCFunctions::AddFunction("isPedWearingJetpack", DoesPedHaveJetPack); // introduced in 1.5.5-9.13176
29+
CLuaCFunctions::AddFunction("isPedWearingJetpack", DoesPedHaveJetPack); // introduced in 1.5.5-9.13846
3030
CLuaCFunctions::AddFunction("isPedOnGround", IsPedOnGround);
3131
CLuaCFunctions::AddFunction("getPedTask", GetPedTask);
3232
CLuaCFunctions::AddFunction("getPedSimplestTask", GetPedSimplestTask);
@@ -105,7 +105,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
105105

106106
lua_classfunction(luaVM, "canBeKnockedOffBike", "canPedBeKnockedOffBike");
107107
lua_classfunction(luaVM, "doesHaveJetPack", "doesPedHaveJetPack");
108-
lua_classfunction(luaVM, "isWearingJetpack", "isPedWearingJetpack"); // introduced in 1.5.5-9.13176
108+
lua_classfunction(luaVM, "isWearingJetpack", "isPedWearingJetpack"); // introduced in 1.5.5-9.13846
109109
lua_classfunction(luaVM, "getAmmoInClip", "getPedAmmoInClip");
110110
lua_classfunction(luaVM, "getAnalogControlState", "getPedAnalogControlState");
111111
lua_classfunction(luaVM, "getAnimation", "getPedAnimation");
@@ -172,7 +172,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
172172
lua_classvariable(luaVM, "vehicleSeat", NULL, "getPedOccupiedVehicleSeat");
173173
lua_classvariable(luaVM, "canBeKnockedOffBike", "setPedCanBeKnockedOffBike", "canPedBeKnockedOffBike");
174174
lua_classvariable(luaVM, "hasJetPack", NULL, "doesPedHaveJetPack");
175-
lua_classvariable(luaVM, "jetpack", NULL, "isPedWearingJetpack"); // introduced in 1.5.5-9.13176
175+
lua_classvariable(luaVM, "jetpack", NULL, "isPedWearingJetpack"); // introduced in 1.5.5-9.13846
176176
lua_classvariable(luaVM, "armor", NULL, "getPedArmor");
177177
lua_classvariable(luaVM, "cameraRotation", "setPedCameraRotation", "getPedCameraRotation");
178178
lua_classvariable(luaVM, "contactElement", NULL, "getPedContactElement");

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ namespace
166166
{"setElementCallPropagationEnabled", "1.3.5-9.06118"},
167167
{"isElementCallPropagationEnabled", "1.3.5-9.06118"},
168168
{"getResourceState", "1.3.5-9.06194"},
169-
{"isPedWearingJetpack", "1.5.5-9.13176"},
169+
{"isPedWearingJetpack", "1.5.5-9.13846"},
170170
};
171171

172172
SVersionItem serverFunctionInitList[] = {
@@ -243,8 +243,8 @@ namespace
243243
{"isElementCallPropagationEnabled", "1.3.5-9.06118"},
244244
{"resendPlayerACInfo", "1.5.1-9.07633"},
245245
{"dbPrepareString", "1.5.2"},
246-
{"isPedWearingJetpack", "1.5.5-9.13176"},
247-
{"setPedWearingJetpack", "1.5.5-9.13176"},
246+
{"isPedWearingJetpack", "1.5.5-9.13846"},
247+
{"setPedWearingJetpack", "1.5.5-9.13846"},
248248
};
249249

250250
//

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ 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
378+
// Deprecated since 1.5.5-9.13846
379379
CLuaCFunctions::AddFunction("doesPedHaveJetPack", CLuaPedDefs::DoesPedHaveJetPack);
380380
CLuaCFunctions::AddFunction("givePedJetPack", CLuaPedDefs::GivePedJetPack);
381381
CLuaCFunctions::AddFunction("removePedJetPack", CLuaPedDefs::RemovePedJetPack);

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

Lines changed: 6 additions & 6 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("isPedWearingJetpack", DoesPedHaveJetPack); // introduced in 1.5.5-9.13176
33+
CLuaCFunctions::AddFunction("isPedWearingJetpack", DoesPedHaveJetPack); // introduced in 1.5.5-9.13846
3434
CLuaCFunctions::AddFunction("isPedOnGround", IsPedOnGround);
3535
CLuaCFunctions::AddFunction("getPedFightingStyle", GetPedFightingStyle);
3636
CLuaCFunctions::AddFunction("getPedWalkingStyle", GetPedMoveAnim);
@@ -52,7 +52,7 @@ void CLuaPedDefs::LoadFunctions(void)
5252
CLuaCFunctions::AddFunction("setPedStat", SetPedStat);
5353
CLuaCFunctions::AddFunction("addPedClothes", AddPedClothes);
5454
CLuaCFunctions::AddFunction("removePedClothes", RemovePedClothes);
55-
CLuaCFunctions::AddFunction("setPedWearingJetpack", SetPedWearingJetpack); // introduced in 1.5.5-9.13176
55+
CLuaCFunctions::AddFunction("setPedWearingJetpack", SetPedWearingJetpack); // introduced in 1.5.5-9.13846
5656
CLuaCFunctions::AddFunction("setPedFightingStyle", SetPedFightingStyle);
5757
CLuaCFunctions::AddFunction("setPedWalkingStyle", SetPedMoveAnim);
5858
CLuaCFunctions::AddFunction("setPedGravity", SetPedGravity);
@@ -94,7 +94,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
9494
lua_classfunction(luaVM, "removeClothes", "removePedClothes");
9595
lua_classfunction(luaVM, "removeFromVehicle", "removePedFromVehicle");
9696
lua_classfunction(luaVM, "removeJetPack", "removePedJetPack");
97-
lua_classfunction(luaVM, "doesHaveJetpack", "doesPedHaveJetPack"); // deprecated in 1.5.5-9.13176
97+
lua_classfunction(luaVM, "doesHaveJetpack", "doesPedHaveJetPack"); // deprecated in 1.5.5-9.13846
9898

9999
lua_classfunction(luaVM, "isDead", "isPedDead");
100100
lua_classfunction(luaVM, "isDucked", "isPedDucked");
@@ -106,7 +106,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
106106
lua_classfunction(luaVM, "isDoingGangDriveby", "isPedDoingGangDriveby");
107107
lua_classfunction(luaVM, "isFrozen", "isPedFrozen");
108108
lua_classfunction(luaVM, "isHeadless", "isPedHeadless");
109-
lua_classfunction(luaVM, "isWearingJetpack", "isPedWearingJetpack"); // introduced in 1.5.5-9.13176
109+
lua_classfunction(luaVM, "isWearingJetpack", "isPedWearingJetpack"); // introduced in 1.5.5-9.13846
110110

111111
lua_classfunction(luaVM, "getArmor", "getPedArmor");
112112
lua_classfunction(luaVM, "getFightingStyle", "getPedFightingStyle");
@@ -136,7 +136,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
136136
lua_classfunction(luaVM, "setWalkingStyle", "setPedWalkingStyle");
137137
lua_classfunction(luaVM, "setAnimation", "setPedAnimation");
138138
lua_classfunction(luaVM, "setAnimationProgress", "setPedAnimationProgress");
139-
lua_classfunction(luaVM, "setWearingJetpack", "setPedWearingJetpack"); // introduced in 1.5.5-9.13176
139+
lua_classfunction(luaVM, "setWearingJetpack", "setPedWearingJetpack"); // introduced in 1.5.5-9.13846
140140

141141
lua_classvariable(luaVM, "inVehicle", NULL, "isPedInVehicle");
142142
lua_classvariable(luaVM, "ducked", NULL, "isPedDucked");
@@ -158,7 +158,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
158158
GetPedOccupiedVehicle); // what about removePedFromVehicle?
159159
lua_classvariable(luaVM, "dead", "killPed", "isPedDead"); // Setting this to any value will still kill the ped. Should we special case this?
160160
lua_classvariable(luaVM, "walkingStyle", "setPedWalkingStyle", "getPedWalkingStyle");
161-
lua_classvariable(luaVM, "jetpack", "setPedWearingJetpack", "isPedWearingJetpack"); // introduced in 1.5.5-9.13176
161+
lua_classvariable(luaVM, "jetpack", "setPedWearingJetpack", "isPedWearingJetpack"); // introduced in 1.5.5-9.13846
162162
// lua_classvariable ( luaVM, "stats", "setPedStat", "getPedStat", CLuaOOPDefs::SetPedStat, CLuaOOPDefs::GetPedStat ); // table
163163
// lua_classvariable ( luaVM, "controlState", "setPedControlState", "getPedControlState", CLuaOOPDefs::SetPedControlState, CLuaOOPDefs::GetPedControlState
164164
// ); // TODO: .controlState["control"] = value

0 commit comments

Comments
 (0)