Spectator overhaul

addons/common/XEH_PREP.hpp

@@ -76,6 +76,7 @@ PREP(getTurretDirection);
 PREP(getUavControlPosition);
 PREP(getVehicleCargo);
 PREP(getVehicleCodriver);
+PREP(getVehicleIcon);
 PREP(getVersion);
 PREP(getWeaponAzimuthAndInclination);
 PREP(getWeaponIndex);

addons/common/functions/fnc_getName.sqf

@@ -1,11 +1,12 @@
 /*
- * Author: commy2
+ * Author: commy2, SilentSpike
  * Returns the name of the object. Used to prevent issues with the name command.
  *
  * Arguments:
  * 0: Object <OBJECT>
  * 1: Use effective commander name when used on vehicles (default: false) <BOOL>
  * 2: Get Raw Name (Don't sanatize HTML tags `</>`) (default: false) <BOOL>
+ * 3: Maximum number of characters to return (default: -1) <NUM>
  *
  * Return Value:
  * Object Name <STRING>
@@ -17,7 +18,7 @@
  */
 #include "script_component.hpp"
 
-params ["_unit", ["_showEffective", false], ["_useRaw", false]];
+params ["_unit", ["_showEffective", false], ["_useRaw", false], ["_maxChars", -1]];
 
 private _name = "";
 
@@ -31,4 +32,8 @@ if (_unit isKindOf "CAManBase") then {
     };
 };
 
-_name
+if (_maxChars >= 0) then {
+    _name select [0, _maxChars]
+} else {
+    _name
+};

addons/common/functions/fnc_getVehicleIcon.sqf

@@ -0,0 +1,50 @@
+/*
+ * Author: AACO
+ * Function used to get the vehicle icon for provided object (cached)
+ *
+ * Arguments:
+ * 0: Object to get icon of <OBJECT/STRING>
+ *
+ * Return Value:
+ * Icon of vehicle <STRING>
+ *
+ * Examples:
+ * ["B_Soldier_F"] call ace_common_fnc_getVehicleIcon;
+ *
+ * Public: Yes
+ */
+
+#include "script_component.hpp"
+#define DEFAULT_TEXTURE "\A3\ui_f\data\map\vehicleicons\iconMan_ca.paa"
+
+params [["_object", objNull, [objNull, ""]]];
+
+if ((_object isEqualType objNull && {isNull _object}) || {_object isEqualType "" && {_object == ""}}) exitWith { DEFAULT_TEXTURE };
+
+ISNILS(GVAR(vehicleIconCache),call CBA_fnc_createNamespace);
+
+private _objectType = if (_object isEqualType objNull) then {
+    typeOf _object
+} else {
+    _object
+};
+private _cachedValue = GVAR(vehicleIconCache) getVariable _objectType;
+
+if (isNil "_cachedValue") then {
+    private _vehicleValue = getText (configfile >> "CfgVehicles" >> _objectType >> "icon");
+    private _vehicleIconValue = getText (configfile >> "CfgVehicleIcons" >> _vehicleValue);
+
+    if (_vehicleIconValue == "") then {
+        if (_vehicleValue != "" && {((toLower _vehicleValue) find ".paa") > -1}) then {
+            _cachedValue = _vehicleValue;
+        } else {
+            _cachedValue = DEFAULT_TEXTURE;
+        };
+    } else {
+        _cachedValue = _vehicleIconValue;
+    };
+
+    GVAR(vehicleIconCache) setVariable [_objectType, _cachedValue];
+};
+
+_cachedValue

addons/spectator/CfgVehicles.hpp

@@ -3,7 +3,7 @@ class CfgVehicles {
     class GVAR(moduleSettings): ACE_Module {
         scope = 2;
         displayName = CSTRING(Settings_DisplayName);
-        icon = QPATHTOF(UI\Icon_Module_Spectator_ca.paa);
+        icon = QPATHTOF(data\Icon_Module_Spectator_ca.paa);
         category = "ACE";
         function = QFUNC(moduleSpectatorSettings);
         isGlobal = 1;
@@ -114,4 +114,16 @@ class CfgVehicles {
             description = CSTRING(Settings_Description);
         };
     };
+    class VirtualMan_F;
+    class GVAR(vitrual): VirtualMan_F {
+        author = ECSTRING(common,ACETeam);
+        scope = 1;
+        scopeArsenal = 0;
+        scopeCurator = 0;
+
+        weapons[] = {};
+
+        delete ACE_Actions;
+        delete ACE_SelfActions;
+    };
 };