Change Icon Setting to List

diwako · Oct 9, 2024 · d2fbb4f · d2fbb4f
1 parent e092e63
commit d2fbb4f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml
@@ -2059,6 +2059,9 @@
         <Key ID="STR_dui_radar_enable_seat_icons_desc">
             <English>When enabled will show if a unit is in a vehicle or not.</English>
         </Key>
+        <Key ID="STR_dui_radar_enable_seat_icons_sameVehicle">
+            <English>Only in the same vehicle</English>
+        </Key>
         <Key ID="STR_dui_radar_pointer_style">
             <English>Pointer style</English>
             <Chinesesimp>指向风格</Chinesesimp>

diff --git a/addons/radar/XEH_preInit.sqf b/addons/radar/XEH_preInit.sqf
@@ -387,10 +387,10 @@ private _curCat = localize "STR_dui_cat_compass";
 
 [
     QGVAR(enable_seat_icons)
-    ,"CHECKBOX"
+    ,"LIST"
     ,[localize "STR_dui_radar_enable_seat_icons", localize "STR_dui_radar_enable_seat_icons_desc"]
     ,[CBA_SETTINGS_CAT, _curCat]
-    ,true
+    ,[[0, 1, 2], [localize "STR_dui_show_dir_opt1", localize "STR_dui_radar_enable_seat_icons_sameVehicle", localize "STR_dui_show_dir_opt3"], 2]
     ,false
 ] call CBA_fnc_addSetting;
 

diff --git a/addons/radar/functions/fnc_cacheLoop.sqf b/addons/radar/functions/fnc_cacheLoop.sqf
@@ -52,7 +52,7 @@ private _speakingArray = ["", EGVAR(main,speakingIcon), EGVAR(main,speakingRadio
 {
     if (alive _x) then {
         _x setVariable [QGVAR(compass_icon), [_x, _iconNamespace, _player, true] call FUNC(getIcon)];
-        _x setVariable [QGVAR(icon), [_x, _iconNamespace] call FUNC(getIcon)];
+        _x setVariable [QGVAR(icon), [_x, _iconNamespace, _player] call FUNC(getIcon)];
     };
 } forEach _group;
 

diff --git a/addons/radar/functions/fnc_getIcon.sqf b/addons/radar/functions/fnc_getIcon.sqf
@@ -7,7 +7,10 @@ if (!_forCompass && {GVAR(showRank)}) exitWith {
     _namespace getVariable [rank _unit, DUI_RANK_PRIVATE];
 };
 
-if (GVAR(enable_seat_icons) && {!(isNull objectParent _unit || {_forCompass})}) exitWith {
+if (
+    (GVAR(enable_seat_icons) == 2 || {GVAR(enable_seat_icons) == 1 && {vehicle _unit == vehicle _player}}) && 
+    {!(isNull objectParent _unit || {_forCompass})}
+) exitWith {
     private _crewInfo = ((fullCrew (vehicle _unit)) select {_x select 0 isEqualTo _unit}) select 0;
     _crewInfo params ["", "_role", "", "", "_isTurret"];