setPedArmor & warnings

Author: FileEX

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1486,9 +1486,9 @@ bool CStaticFunctionDefinitions::SetElementAlpha(CClientEntity& Entity, unsigned
     return true;
 }
 
-bool CStaticFunctionDefinitions::SetElementHealth(CClientEntity& Entity, float fHealth)
+bool CStaticFunctionDefinitions::SetElementHealth(lua_State* luaState, CClientEntity& Entity, float fHealth)
 {
-    RUN_CHILDREN(SetElementHealth(**iter, fHealth))
+    RUN_CHILDREN(SetElementHealth(luaState, **iter, fHealth))
 
     switch (Entity.GetType())
     {
@@ -1498,7 +1498,10 @@ bool CStaticFunctionDefinitions::SetElementHealth(CClientEntity& Entity, float f
             // Grab the model
             CClientPed& Ped = static_cast<CClientPed&>(Entity);
             if (Ped.IsLocalPlayer())
+            {
+                g_pClientGame->GetScriptDebugging()->LogWarning(luaState, "The client-side setElementHealth function for localPlayer is deprecated. Use the corresponding server-side function instead");
                 return false;
+            }
 
             // If setting health to 0 for local player, clear stale damage data
             // and set proper scripted death parameters for DoWastedCheck

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -99,7 +99,7 @@ class CStaticFunctionDefinitions
     static bool          DetachElements(CClientEntity& Entity, CClientEntity* pAttachedToEntity = NULL);
     static bool          SetElementAttachedOffsets(CClientEntity& Entity, CVector& vecPosition, CVector& vecRotation);
     static bool          SetElementAlpha(CClientEntity& Entity, unsigned char ucAlpha);
-    static bool          SetElementHealth(CClientEntity& Entity, float fHealth);
+    static bool          SetElementHealth(lua_State* luaState, CClientEntity& Entity, float fHealth);
     static bool          SetElementModel(CClientEntity& Entity, unsigned short usModel);
     static bool          SetElementCollisionsEnabled(CClientEntity& Entity, bool bEnabled);
     static bool          SetElementCollidableWith(CClientEntity& Entity, CClientEntity& ThisEntity, bool bCanCollide);

Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp

@@ -2401,7 +2401,7 @@ int CLuaElementDefs::SetElementHealth(lua_State* luaVM)
     // Verify the arguments
     if (!argStream.HasErrors())
     {
-        if (CStaticFunctionDefinitions::SetElementHealth(*pEntity, fHealth))
+        if (CStaticFunctionDefinitions::SetElementHealth(luaVM, *pEntity, fHealth))
         {
             lua_pushboolean(luaVM, true);
             return 1;

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

@@ -2433,6 +2433,9 @@ bool CLuaPedDefs::SetPedArmor(CClientPed* const ped, const float armor)
     if (armor > 100.0f)
         throw std::invalid_argument("Armor must be less than or equal to 100");
 
+    if (ped->IsLocalPlayer())
+        throw LuaFunctionError("The client-side setPedArmor function for localPlayer is deprecated. Use the corresponding server-side function instead", true);
+
     ped->SetArmor(armor);
     return true;
 }