From 671e7d5dc16a9aa5ccffdd6dbfc6242a56cb8b06 Mon Sep 17 00:00:00 2001
From: Valmo Trindade <valmojltrindade@gmail.com>
Date: Thu, 7 May 2026 05:02:51 -0300
Subject: [PATCH] linted uas callsing functions

---
 .../fn_extract_marker_callsign.sqf            | 21 ++++++++++++-------
 .../extract_data/fn_extract_unit_callsign.sqf |  6 +++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/addons/main/functions/extract_data/fn_extract_marker_callsign.sqf b/addons/main/functions/extract_data/fn_extract_marker_callsign.sqf
index 9e6da4b..e38d41b 100644
--- a/addons/main/functions/extract_data/fn_extract_marker_callsign.sqf
+++ b/addons/main/functions/extract_data/fn_extract_marker_callsign.sqf
@@ -5,29 +5,34 @@
 params["_unit"];
 
 private _callsign = "";
+private _displayName = localize (getText (configOf _unit >> "displayName"));
+
+if (_displayName isEqualTo "") then {
+	_displayName = typeOf _unit;
+};
 
 if ((([_unit] call BIS_fnc_objectType) select 0) == "Vehicle") then {
-	_callsign = getText (configOf _unit >> "displayName");
+	_callsign = _displayName;
 
 	if (!isNull driver _unit) then {
-		_callsign = getText (configOf _unit >> "displayName") + " | " + ([name (driver _unit)] call armatak_fnc_shorten_name);
+		_callsign = _displayName + " | " + ([name (driver _unit)] call armatak_fnc_shorten_name);
 	};
 };
 
 if (unitIsUAV _unit) then {
-	_callsign = getText (configOf _unit >> "displayName");
+	_callsign = _displayName;
 
 	if (isUAVConnected _unit) then {
-		_callsign = (_callsign) + "[ON]";
+		_callsign = _callsign + " [ON]";
 	} else {
-		_callsign = (_callsign) + "[OFF]";
+		_callsign = _callsign + " [OFF]";
 	}
 };
 
-armatak_attribute_marker_callsign = _unit getVariable "armatak_attribute_marker_callsign";
+private _markerCallsignOverride = _unit getVariable ["armatak_attribute_marker_callsign", ""];
 
-if (!isNil "armatak_attribute_marker_callsign" or armatak_attribute_marker_callsign != '') then {
-	_callsign = armatak_attribute_marker_callsign;
+if (_markerCallsignOverride isNotEqualTo "") then {
+	_callsign = _markerCallsignOverride;
 };
 
 _callsign
diff --git a/addons/main/functions/extract_data/fn_extract_unit_callsign.sqf b/addons/main/functions/extract_data/fn_extract_unit_callsign.sqf
index caca838..51bf5b6 100644
--- a/addons/main/functions/extract_data/fn_extract_unit_callsign.sqf
+++ b/addons/main/functions/extract_data/fn_extract_unit_callsign.sqf
@@ -20,10 +20,10 @@ if (side _unit == east) then {
 	_callsign = getText (configOf _unit >> "displayName");
 };
 
-armatak_attribute_unit_callsign = _unit getVariable "armatak_attribute_unit_callsign";
+private _unitCallsignOverride = _unit getVariable ["armatak_attribute_unit_callsign", ""];
 
-if (!isNil "armatak_attribute_unit_callsign" or armatak_attribute_unit_callsign != '') then {
-	_callsign = armatak_attribute_unit_callsign;
+if (_unitCallsignOverride isNotEqualTo "") then {
+	_callsign = _unitCallsignOverride;
 };
 
 _callsign