Fix errors caused by conflicts

Author: ArranTuna

Server/mods/deathmatch/logic/CElement.cpp

@@ -716,7 +716,7 @@ bool CElement::SetCustomData(const CStringName& name, const CLuaArgument& Variab
     {
         // Don't allow it to be set if the name is too long
         CLogger::ErrorPrintf("Custom data name too long (%s)\n", *SStringX(name.ToCString()).Left(MAX_CUSTOMDATA_NAME_LENGTH + 1));
-        return;
+        return false;
     }
 
     // Grab the old variable and sync type
@@ -743,9 +743,9 @@ bool CElement::SetCustomData(const CStringName& name, const CLuaArgument& Variab
         {
             // Event was cancelled, restore previous value
             if (pData)
-                m_CustomData.Set(szName, oldVariable, oldSyncType);
+                m_CustomData.Set(name, oldVariable, oldSyncType);
             else
-                m_CustomData.Delete(szName);
+                m_CustomData.Delete(name);
             return false;
         }
     }
@@ -772,7 +772,7 @@ bool CElement::DeleteCustomData(const CStringName& name)
         if (!CallEvent("onElementDataChange", Arguments))
         {
             // Event was cancelled, restore previous value
-            m_CustomData.Set(szName, oldVariable, oldSyncType);
+            m_CustomData.Set(name, oldVariable, oldSyncType);
             return false;
         }
         return true;

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1015,7 +1015,7 @@ bool CStaticFunctionDefinitions::SetElementData(CElement* pElement, CStringName
 
     if (!pCurrentVariable || *pCurrentVariable != Variable || lastSyncType != syncType)
     {
-        if (!pElement->SetCustomData(szName, Variable, syncType))
+        if (!pElement->SetCustomData(name, Variable, syncType))
             return false; // The server cancelled the change in onElementDataChange
 
         if (syncType != ESyncType::LOCAL)
@@ -1052,7 +1052,7 @@ bool CStaticFunctionDefinitions::RemoveElementData(CElement* pElement, CStringNa
     // Check it exists
     if (pElement->GetCustomData(name, false))
     {
-        if (!pElement->DeleteCustomData(szName))
+        if (!pElement->DeleteCustomData(name))
             return false; // The server cancelled the change in onElementDataChange
 
         // Tell our clients to update their data