From a86502c750fabb453d6bd97634a26f9f09bafd5e Mon Sep 17 00:00:00 2001 From: Xenius97 Date: Mon, 24 Nov 2025 17:55:54 +0100 Subject: [PATCH 1/5] Replace isPed/VehicleOnGround with isElementOnGround --- .../logic/luadefs/CLuaElementDefs.cpp | 19 +++++++++++++++++++ .../logic/luadefs/CLuaElementDefs.h | 1 + .../deathmatch/logic/luadefs/CLuaPedDefs.cpp | 1 - .../logic/luadefs/CLuaVehicleDefs.cpp | 1 - .../deathmatch/logic/CResourceChecker.Data.h | 9 ++++++++- .../logic/luadefs/CLuaElementDefs.cpp | 19 +++++++++++++++++++ .../logic/luadefs/CLuaElementDefs.h | 1 + .../deathmatch/logic/luadefs/CLuaPedDefs.cpp | 1 - .../logic/luadefs/CLuaVehicleDefs.cpp | 1 - 9 files changed, 48 insertions(+), 5 deletions(-) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index c763e1d3f4a..950225f5804 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -100,6 +100,7 @@ void CLuaElementDefs::LoadFunctions() {"setElementCallPropagationEnabled", SetElementCallPropagationEnabled}, {"setElementLighting", ArgumentParser}, {"setElementOnFire", ArgumentParser}, + {"isElementOnGround", ArgumentParser}, }; // Add functions @@ -195,6 +196,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM) lua_classfunction(luaVM, "setStreamable", "setElementStreamable"); lua_classfunction(luaVM, "setLighting", "setElementLighting"); lua_classfunction(luaVM, "setOnFire", "setElementOnFire"); + lua_classfunction(luaVM, "onGround", "isElementOnGround"); lua_classvariable(luaVM, "callPropagationEnabled", "setElementCallPropagationEnabled", "isElementCallPropagationEnabled"); lua_classvariable(luaVM, "waitingForGroundToLoad", NULL, "isElementWaitingForGroundToLoad"); @@ -231,6 +233,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM) lua_classvariable(luaVM, "isElement", NULL, "isElement"); lua_classvariable(luaVM, "lighting", "setElementLighting", "getElementLighting"); lua_classvariable(luaVM, "onFire", "setElementOnFire", "isElementOnFire"); + lua_classvariable(luaVM, "onGround", NULL, "isElementOnGround"); // TODO: Support element data: player.data["age"] = 1337; <=> setElementData(player, "age", 1337) lua_registerclass(luaVM, "Element"); @@ -2660,3 +2663,19 @@ bool CLuaElementDefs::IsElementOnFire(CClientEntity* entity) noexcept { return entity->IsOnFire(); } + +bool CLuaElementDefs::IsElementOnGround(CClientEntity* entity) noexcept +{ + switch (entity->GetType()) + { + case CCLIENTPLAYER: + case CCLIENTPED: + return static_cast(entity)->IsOnGround(); + case CCLIENTVEHICLE: + return static_cast(entity)->IsOnGround(); + default: + throw std::invalid_argument{"This element type does not support IsElementOnGround"}; + } + + return false; +} diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h index 3d82ddcb145..5d9178256ac 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h @@ -72,6 +72,7 @@ class CLuaElementDefs : public CLuaDefs LUA_DECLARE(IsElementCallPropagationEnabled); LUA_DECLARE(IsElementWaitingForGroundToLoad); static bool IsElementOnFire(CClientEntity* entity) noexcept; + static bool IsElementOnGround(CClientEntity* entity) noexcept; // Element set funcs LUA_DECLARE(CreateElement); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index 68b707d14b3..74ae512325b 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -233,7 +233,6 @@ void CLuaPedDefs::AddClass(lua_State* luaVM) lua_classvariable(luaVM, "headless", "setPedHeadless", "isPedHeadless"); lua_classvariable(luaVM, "inVehicle", NULL, "isPedInVehicle"); lua_classvariable(luaVM, "onFire", "setPedOnFire", "isPedOnFire"); - lua_classvariable(luaVM, "onGround", NULL, "isPedOnGround"); lua_classvariable(luaVM, "dead", NULL, "isPedDead"); lua_classvariable(luaVM, "targetingMarker", "setPedTargetingMarkerEnabled", "isPedTargetingMarkerEnabled"); lua_classvariable(luaVM, "footBlood", "setPedFootBloodEnabled", NULL); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index 94945f0fbc5..ecafad0eaff 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -333,7 +333,6 @@ void CLuaVehicleDefs::AddClass(lua_State* luaVM) lua_classvariable(luaVM, "blown", NULL, "isVehicleBlown"); lua_classvariable(luaVM, "vehicleType", NULL, "getVehicleType"); lua_classvariable(luaVM, "gear", NULL, "getVehicleCurrentGear"); - lua_classvariable(luaVM, "onGround", NULL, "isVehicleOnGround"); lua_classvariable(luaVM, "damageProof", NULL, "isVehicleDamageProof"); lua_classvariable(luaVM, "helicopterRotorSpeed", "setHelicopterRotorSpeed", "getHelicopterRotorSpeed"); lua_classvariable(luaVM, "heliBladeCollisionsEnabled", "setHeliBladeCollisionsEnabled", "getHeliBladeCollisionsEnabled"); diff --git a/Server/mods/deathmatch/logic/CResourceChecker.Data.h b/Server/mods/deathmatch/logic/CResourceChecker.Data.h index 51d8c22258c..dd552b98082 100644 --- a/Server/mods/deathmatch/logic/CResourceChecker.Data.h +++ b/Server/mods/deathmatch/logic/CResourceChecker.Data.h @@ -138,6 +138,9 @@ namespace {false, "removeAllGameBuildings", "removeGameWorld"}, {false, "restoreAllGameBuildings", "restoreGameWorld"}, + + {false, "isPedOnGround", "isElementOnGround"}, + {false, "isVehicleOnGround", "isElementOnGround"}, }; SDeprecatedItem serverDeprecatedList[] = { @@ -244,6 +247,10 @@ namespace // Ped {false, "setPedOnFire", "setElementOnFire"}, - {false, "isPedOnFire", "isElementOnFire"} + {false, "isPedOnFire", "isElementOnFire"}, + {false, "isPedOnGround", "isElementOnGround"}, + + // Vehicle + {false, "isVehicleOnGround", "isElementOnGround"} }; } // namespace diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 7d339104fb3..87294657ec8 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -62,6 +62,7 @@ void CLuaElementDefs::LoadFunctions() {"getElementCollisionsEnabled", getElementCollisionsEnabled}, {"getLowLODElement", getLowLODElement}, {"isElementOnFire", ArgumentParser}, + {"isElementOnGround", ArgumentParser}, // Attachement {"attachElements", attachElements}, @@ -154,6 +155,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM) lua_classfunction(luaVM, "setAttachedOffsets", "setElementAttachedOffsets"); lua_classfunction(luaVM, "setCallPropagationEnabled", "setElementCallPropagationEnabled"); lua_classfunction(luaVM, "setOnFire", "setElementOnFire"); + lua_classfunction(luaVM, "onGround", "isElementOnGround"); lua_classfunction(luaVM, "getAttachedOffsets", "getElementAttachedOffsets"); lua_classfunction(luaVM, "getChild", "getElementChild"); @@ -222,6 +224,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM) lua_classvariable(luaVM, "angularVelocity", "setElementAngularVelocity", "getElementAngularVelocity", setElementTurnVelocity, OOP_getElementTurnVelocity); lua_classvariable(luaVM, "isElement", NULL, "isElement"); lua_classvariable(luaVM, "onFire", "setElementOnFire", "isElementOnFire"); + lua_classvariable(luaVM, "onGround", NULL, "isElementOnGround"); lua_registerclass(luaVM, "Element"); } @@ -2460,3 +2463,19 @@ bool CLuaElementDefs::SetElementOnFire(CElement* element, bool onFire) noexcept { return CStaticFunctionDefinitions::SetElementOnFire(element, onFire); } + +bool CLuaElementDefs::IsElementOnGround(CElement* element) noexcept +{ + switch (element->GetType()) + { + case CElement::PLAYER: + case CElement::PED: + return static_cast(element)->IsOnGround(); + case CElement::VEHICLE: + return static_cast(element)->IsOnGround(); + default: + throw std::invalid_argument{"This element type does not support IsElementOnGround"}; + } + + return false; +} diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h index 89745b5a3fb..8b899aafe8f 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h @@ -108,4 +108,5 @@ class CLuaElementDefs : public CLuaDefs LUA_DECLARE(setLowLODElement); LUA_DECLARE(setElementCallPropagationEnabled); static bool SetElementOnFire(CElement* element, bool onFire) noexcept; + static bool IsElementOnGround(CElement* element) noexcept; }; diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index 1d10a059162..7ad0cc11b67 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -155,7 +155,6 @@ void CLuaPedDefs::AddClass(lua_State* luaVM) lua_classvariable(luaVM, "inVehicle", NULL, "isPedInVehicle"); lua_classvariable(luaVM, "ducked", NULL, "isPedDucked"); lua_classvariable(luaVM, "inWater", NULL, "isPedInWater"); - lua_classvariable(luaVM, "onGround", NULL, "isPedOnGround"); lua_classvariable(luaVM, "onFire", "setPedOnFire", "isPedOnFire"); lua_classvariable(luaVM, "choking", "setPedChoking", "isPedChoking"); lua_classvariable(luaVM, "doingGangDriveby", "setPedDoingGangDriveby", "isPedDoingGangDriveby"); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index 13d72615fcd..fcd878d822a 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -280,7 +280,6 @@ void CLuaVehicleDefs::AddClass(lua_State* luaVM) OOP_GetVehicleRespawnPosition); lua_classvariable(luaVM, "respawnRotation", "setVehicleRespawnRotation", "getVehicleRespawnRotation", SetVehicleRespawnRotation, OOP_GetVehicleRespawnRotation); - lua_classvariable(luaVM, "onGround", NULL, "isVehicleOnGround"); lua_classvariable(luaVM, "name", NULL, "getVehicleName"); lua_classvariable(luaVM, "vehicleType", NULL, "getVehicleType"); lua_classvariable(luaVM, "sirens", NULL, "getVehicleSirens"); From 48653ee6b362d43d97163dc9984fefc888db6017 Mon Sep 17 00:00:00 2001 From: Xenius97 Date: Mon, 24 Nov 2025 18:01:08 +0100 Subject: [PATCH 2/5] Add missing onGround --- Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 1 + Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 950225f5804..dbd072495f6 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -172,6 +172,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM) lua_classfunction(luaVM, "getData", "getElementData"); lua_classfunction(luaVM, "getAllData", "getAllElementData"); lua_classfunction(luaVM, "isOnFire", "isElementOnFire"); + lua_classfunction(luaVM, "onGround", "isElementOnGround"); lua_classfunction(luaVM, "setAttachedOffsets", "setElementAttachedOffsets"); lua_classfunction(luaVM, "setData", "setElementData"); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 87294657ec8..535223a7485 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -195,6 +195,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM) lua_classfunction(luaVM, "isLowLOD", "isElementLowLOD"); lua_classfunction(luaVM, "isAttached", "isElementAttached"); lua_classfunction(luaVM, "isOnFire", "isElementOnFire"); + lua_classfunction(luaVM, "onGround", "isElementOnGround"); lua_classvariable(luaVM, "id", "setElementID", "getElementID"); lua_classvariable(luaVM, "callPropagationEnabled", "setElementCallPropagationEnabled", "isElementCallPropagationEnabled"); From 60986f5cad359149f8907d94575c7e66b642b4f4 Mon Sep 17 00:00:00 2001 From: Xenius97 Date: Mon, 24 Nov 2025 18:07:53 +0100 Subject: [PATCH 3/5] fix --- Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp | 1 + Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 1 + Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp | 1 + Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index 74ae512325b..68b707d14b3 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -233,6 +233,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM) lua_classvariable(luaVM, "headless", "setPedHeadless", "isPedHeadless"); lua_classvariable(luaVM, "inVehicle", NULL, "isPedInVehicle"); lua_classvariable(luaVM, "onFire", "setPedOnFire", "isPedOnFire"); + lua_classvariable(luaVM, "onGround", NULL, "isPedOnGround"); lua_classvariable(luaVM, "dead", NULL, "isPedDead"); lua_classvariable(luaVM, "targetingMarker", "setPedTargetingMarkerEnabled", "isPedTargetingMarkerEnabled"); lua_classvariable(luaVM, "footBlood", "setPedFootBloodEnabled", NULL); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index ecafad0eaff..94945f0fbc5 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -333,6 +333,7 @@ void CLuaVehicleDefs::AddClass(lua_State* luaVM) lua_classvariable(luaVM, "blown", NULL, "isVehicleBlown"); lua_classvariable(luaVM, "vehicleType", NULL, "getVehicleType"); lua_classvariable(luaVM, "gear", NULL, "getVehicleCurrentGear"); + lua_classvariable(luaVM, "onGround", NULL, "isVehicleOnGround"); lua_classvariable(luaVM, "damageProof", NULL, "isVehicleDamageProof"); lua_classvariable(luaVM, "helicopterRotorSpeed", "setHelicopterRotorSpeed", "getHelicopterRotorSpeed"); lua_classvariable(luaVM, "heliBladeCollisionsEnabled", "setHeliBladeCollisionsEnabled", "getHeliBladeCollisionsEnabled"); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index 7ad0cc11b67..1d10a059162 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -155,6 +155,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM) lua_classvariable(luaVM, "inVehicle", NULL, "isPedInVehicle"); lua_classvariable(luaVM, "ducked", NULL, "isPedDucked"); lua_classvariable(luaVM, "inWater", NULL, "isPedInWater"); + lua_classvariable(luaVM, "onGround", NULL, "isPedOnGround"); lua_classvariable(luaVM, "onFire", "setPedOnFire", "isPedOnFire"); lua_classvariable(luaVM, "choking", "setPedChoking", "isPedChoking"); lua_classvariable(luaVM, "doingGangDriveby", "setPedDoingGangDriveby", "isPedDoingGangDriveby"); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index fcd878d822a..13d72615fcd 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -280,6 +280,7 @@ void CLuaVehicleDefs::AddClass(lua_State* luaVM) OOP_GetVehicleRespawnPosition); lua_classvariable(luaVM, "respawnRotation", "setVehicleRespawnRotation", "getVehicleRespawnRotation", SetVehicleRespawnRotation, OOP_GetVehicleRespawnRotation); + lua_classvariable(luaVM, "onGround", NULL, "isVehicleOnGround"); lua_classvariable(luaVM, "name", NULL, "getVehicleName"); lua_classvariable(luaVM, "vehicleType", NULL, "getVehicleType"); lua_classvariable(luaVM, "sirens", NULL, "getVehicleSirens"); From f96c5b06434be7d5a922586f87f25cd9098e210f Mon Sep 17 00:00:00 2001 From: Xenius97 Date: Mon, 24 Nov 2025 18:09:22 +0100 Subject: [PATCH 4/5] remove double class adds --- Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 1 - Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index dbd072495f6..df7377ada51 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -197,7 +197,6 @@ void CLuaElementDefs::AddClass(lua_State* luaVM) lua_classfunction(luaVM, "setStreamable", "setElementStreamable"); lua_classfunction(luaVM, "setLighting", "setElementLighting"); lua_classfunction(luaVM, "setOnFire", "setElementOnFire"); - lua_classfunction(luaVM, "onGround", "isElementOnGround"); lua_classvariable(luaVM, "callPropagationEnabled", "setElementCallPropagationEnabled", "isElementCallPropagationEnabled"); lua_classvariable(luaVM, "waitingForGroundToLoad", NULL, "isElementWaitingForGroundToLoad"); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 535223a7485..fc63a923e2f 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -155,7 +155,6 @@ void CLuaElementDefs::AddClass(lua_State* luaVM) lua_classfunction(luaVM, "setAttachedOffsets", "setElementAttachedOffsets"); lua_classfunction(luaVM, "setCallPropagationEnabled", "setElementCallPropagationEnabled"); lua_classfunction(luaVM, "setOnFire", "setElementOnFire"); - lua_classfunction(luaVM, "onGround", "isElementOnGround"); lua_classfunction(luaVM, "getAttachedOffsets", "getElementAttachedOffsets"); lua_classfunction(luaVM, "getChild", "getElementChild"); From c38b8540288dfdeb6b5b48249107f0b0ece7a9aa Mon Sep 17 00:00:00 2001 From: Xenius97 Date: Thu, 27 Nov 2025 16:48:12 +0100 Subject: [PATCH 5/5] fix --- Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index df7377ada51..ea92a1e5945 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -2664,7 +2664,7 @@ bool CLuaElementDefs::IsElementOnFire(CClientEntity* entity) noexcept return entity->IsOnFire(); } -bool CLuaElementDefs::IsElementOnGround(CClientEntity* entity) noexcept +bool CLuaElementDefs::IsElementOnGround(CClientEntity* entity) { switch (entity->GetType()) { diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h index 5d9178256ac..daaf62def72 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h @@ -72,7 +72,7 @@ class CLuaElementDefs : public CLuaDefs LUA_DECLARE(IsElementCallPropagationEnabled); LUA_DECLARE(IsElementWaitingForGroundToLoad); static bool IsElementOnFire(CClientEntity* entity) noexcept; - static bool IsElementOnGround(CClientEntity* entity) noexcept; + static bool IsElementOnGround(CClientEntity* entity); // Element set funcs LUA_DECLARE(CreateElement); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index fc63a923e2f..6ef491ae393 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -2464,7 +2464,7 @@ bool CLuaElementDefs::SetElementOnFire(CElement* element, bool onFire) noexcept return CStaticFunctionDefinitions::SetElementOnFire(element, onFire); } -bool CLuaElementDefs::IsElementOnGround(CElement* element) noexcept +bool CLuaElementDefs::IsElementOnGround(CElement* element) { switch (element->GetType()) { diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h index 8b899aafe8f..ab2bfa9a0c6 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h @@ -108,5 +108,5 @@ class CLuaElementDefs : public CLuaDefs LUA_DECLARE(setLowLODElement); LUA_DECLARE(setElementCallPropagationEnabled); static bool SetElementOnFire(CElement* element, bool onFire) noexcept; - static bool IsElementOnGround(CElement* element) noexcept; + static bool IsElementOnGround(CElement* element); };