From d2fbb4fffdf0e44baa80c19c5c3aaa52727587f1 Mon Sep 17 00:00:00 2001
From: mrschick <58027418+mrschick@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:15:11 +0200
Subject: [PATCH] Change Icon Setting to List
---
addons/main/stringtable.xml | 3 +++
addons/radar/XEH_preInit.sqf | 4 ++--
addons/radar/functions/fnc_cacheLoop.sqf | 2 +-
addons/radar/functions/fnc_getIcon.sqf | 5 ++++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml
index b1a195f..d4e4be5 100644
--- a/addons/main/stringtable.xml
+++ b/addons/main/stringtable.xml
@@ -2059,6 +2059,9 @@
When enabled will show if a unit is in a vehicle or not.
+
+ Only in the same vehicle
+
Pointer style
指向风格
diff --git a/addons/radar/XEH_preInit.sqf b/addons/radar/XEH_preInit.sqf
index 7501325..0c50234 100644
--- 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
index 4b48119..871d9e8 100644
--- 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
index 5e82dbd..fb94865 100644
--- 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"];