Dogtags - Improve displaying dogtags from bodies with no name (#10096)

Improve displaying dogtags from bodies with no name
acemod · Jul 3, 2024 · 4d0641a · 4d0641a
1 parent dae2c5b
commit 4d0641a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/addons/dogtags/XEH_postInit.sqf b/addons/dogtags/XEH_postInit.sqf
@@ -66,10 +66,14 @@ if (["ace_arsenal"] call EFUNC(common,isModLoaded)) then {
                 _item = _rightPanel lnbData [_i, 0];
 
                 if (_item isKindOf ["ACE_dogtag", _cfgWeapons]) then {
-                    _dogtagData = _allDogtagsData param [_allDogtags find _item, []];
+                    private _name = (_allDogtagsData param [_allDogtags find _item, []]) param [0, ""];
 
-                    // If data doesn't exist, put name as "unknown"
-                    _rightPanel lnbSetText [[_i, 1], [LLSTRING(itemName), ": ", _dogtagData param [0, LELSTRING(common,unknown)]] joinString ""];
+                    // If data doesn't exist or body has no name, set name as "unknown"
+                    if (_name == "") then {
+                        _name = LELSTRING(common,unknown);
+                    };
+
+                    _rightPanel lnbSetText [[_i, 1], [LLSTRING(itemName), ": ", _name] joinString ""];
                 };
             };
         };

diff --git a/addons/dogtags/functions/fnc_addDogtagItem.sqf b/addons/dogtags/functions/fnc_addDogtagItem.sqf
@@ -23,8 +23,14 @@ if (_item == "") exitWith {};
 // Verify that the unit has inventory space, otherwise drop the dogtag on the ground
 [ace_player, _item, true] call CBA_fnc_addItem;
 
-_dogtagData params ["_nickName"];
-private _displayText = format [localize LSTRING(takeDogtagSuccess), _nickName];
+_dogtagData params ["_name"];
+
+// If data doesn't exist or body has no name, set name as "unknown"
+if (_name == "") then {
+    _name = LELSTRING(common,unknown);
+};
+
+private _displayText = format [localize LSTRING(takeDogtagSuccess), _name];
 
 // display message
 [{

diff --git a/addons/dogtags/functions/fnc_showDogtag.sqf b/addons/dogtags/functions/fnc_showDogtag.sqf
@@ -31,5 +31,11 @@ private _display = uiNamespace getvariable [QGVAR(tag), displayNull];
 if(isNull _display) exitWith {};
 
 private _control = _display displayCtrl 1001;
-_dogtagData params ["_nickName", "_code", "_bloodType"];
-_control ctrlSetStructuredText parseText format ["%1<br/>%2<br/>%3", toUpper _nickName, _code, _bloodType];
+_dogtagData params ["_name", "_code", "_bloodType"];
+
+// If data doesn't exist or body has no name, set name as "unknown"
+if (_name == "") then {
+    _name = LELSTRING(common,unknown);
+};
+
+_control ctrlSetStructuredText parseText format ["%1<br/>%2<br/>%3", toUpper _name, _code, _bloodType];