Fix dropdown when channels are disabled

.gitignore

@@ -15,4 +15,5 @@ release/
 releases/
 keys/
 .hemttout/
+*.hemttprivatekey
 ####

.hemtt/lints.toml

@@ -0,0 +1,12 @@
+[sqf.var_all_caps]
+options.ignore = [
+    "MTS_RECOMPILES",
+    "MTS_PREP_RECOMPILE"
+]
+
+[sqf.banned_macros]
+options.release = [
+    "DEBUG_MODE_FULL",
+    "DISABLE_COMPILE_CACHE",
+    "CBA_DEBUG_SYNCHRONOUS"
+]

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
     "recommendations": [
-        "blackfisch.sqf-language",
         "editorconfig.editorconfig",
-        "bux578.vscode-openlastrpt"
+        "brettmayson.hemtt"
     ]
 }

addons/markers/XEH_PREP.hpp

@@ -14,8 +14,8 @@ PREP(getAllModifiers);
 PREP(getBroadcastChannel);
 PREP(getBroadcastTargets);
 PREP(getCharMarkerType);
-PREP(getDisplay);
 PREP(getDTGUIData);
+PREP(getDisplay);
 PREP(getMarkerAlpha);
 PREP(getMarkerConfig);
 PREP(getMarkerFamily);
@@ -57,6 +57,6 @@ PREP(setMarkerPreview);
 PREP(setMarkerScale);
 PREP(setMarkerScaleLocal);
 PREP(setUIData);
-PREP(toDTGCharaters);
+PREP(toDTGCharacters);
 PREP(transmitUIData);
 PREP(updatePresetsList);

addons/markers/functions/fnc_createMarker.sqf

@@ -12,7 +12,7 @@
  *      3: ARRAY - The marker configuration.
  *          0: ARRAY - Frameshape of the marker.
  *              0: STRING - Identity (blu, red, neu, unk).
- *              1: BOOLEAN - Dashed (e.g. supect).
+ *              1: BOOLEAN - Dashed (e.g. suspect).
  *              2: BOOLEAN - Headquarters.
  *          1: ARRAY - Composition of modifier for the marker. IDs are listed in the wiki. (Optional, default: no modifiers)
  *              0: NUMBER - Icon (0 for none).

addons/markers/functions/fnc_createMarkerLocal.sqf

@@ -14,7 +14,7 @@
  *      3: ARRAY - The marker configuration.
  *          0: ARRAY - Frameshape of the marker.
  *              0: STRING - Identity (blu, red, neu, unk).
- *              1: BOOLEAN - Dashed (e.g. supect).
+ *              1: BOOLEAN - Dashed (e.g. suspect).
  *              2: BOOLEAN - Headquarters.
  *          1: ARRAY - Composition of modifier for the marker. IDs are listed in the wiki. (Optional, default: no modifiers)
  *              0: NUMBER - Icon (0 for none).
@@ -203,7 +203,7 @@ if (_additionalInfo isNotEqualTo "") then {
 };
 
 // create text marker (bottom left of marker)
-if ((count _uniqueDesignation) > 0) then {
+if (_uniqueDesignation isNotEqualTo []) then {
     TRACE_1("uniqueDesignation input",_uniqueDesignation);
     scopeName "textLeftCreation";
 
@@ -245,7 +245,7 @@ if ((count _uniqueDesignation) > 0) then {
 };
 
 // create text marker (bottom right of marker)
-if ((count _higherFormation) > 0) then {
+if (_higherFormation isNotEqualTo []) then {
     TRACE_1("higherFormation input",_higherFormation);
     scopeName "textRightCreation";
 
@@ -300,9 +300,9 @@ if (_operationalCondition > 0) then {
 };
 
 // Create Date-Time Group markers
-if ((count _dateTimeGroup) > 0) then {
+if (_dateTimeGroup isNotEqualTo []) then {
     // Returns array in format [D, D, H, H, M, M, Z, mmm, Y, Y].
-    private _dtgCharacters = _dateTimeGroup call FUNC(toDTGCharaters);
+    private _dtgCharacters = _dateTimeGroup call FUNC(toDTGCharacters);
 
     CHECKRET(_dtgCharacters isEqualTo [],WARNING_1("Date-Time Group is invalid. Will not create DTG markers. DTG: %1",_dateTimeGroup));
 
@@ -333,7 +333,7 @@ GVAR(localMarkers) set [_namePrefix, CBA_missionTime, true];
 
 private _markerInformation = GVAR(namespace) getVariable [_namePrefix, []];
 if (_markerInformation isEqualTo []) then { //save in mts_markers_namespace
-    //save inmutable variables of marker
+    //save immutable variables of marker
     GVAR(namespace) setVariable [_namePrefix, [_markerFamily, _markerParameter, _broadcastChannel], true];
 
     if (is3DEN) then {

addons/markers/functions/fnc_getBroadcastTargets.sqf

@@ -3,7 +3,7 @@
  *  Author: Timi007
  *
  *  Description:
- *      Returnes broadcast targets for remoteExec based on the broadcast channel.
+ *      Returns broadcast targets for remoteExec based on the broadcast channel.
  *
  *  Parameter(s):
  *      0: NUMBER - Broadcast channel. (Check "currentChannel" command for channel ID; Use -1 for local creation)

addons/markers/functions/fnc_initializeUI.sqf

@@ -8,7 +8,7 @@
  *      Adds Combobox selections and pictures.
  *
  *  Parameter(s):
- *      0: DISPLAY - Display on which the dialog should apear. (Check mts_markers_fnc_getDisplay)
+ *      0: DISPLAY - Display on which the dialog should appear. (Check mts_markers_fnc_getDisplay)
  *      1: ARRAY - Mouse position on map. (Not needed if parameter 2 is given e.g. nil)
  *      2: STRING - Unique marker prefix for editing set marker. (Not needed if dialog should open with default settings)
  *
@@ -117,13 +117,15 @@ if (!isMultiplayer || is3DEN) then {
     {
         _x params ["_channelText", "_channelID", "_channelColor"];
 
-        if (!((channelEnabled _channelID) isEqualTo [false, false]) || _channelID isEqualTo 3) then {
+        (channelEnabled _channelID) params ["", "", ["_areMarkersEnabled", true, [true]]];
+
+        if (_areMarkersEnabled || _channelID isEqualTo 3) then {
             private _selectionColor = (configFile >> "RscChatListMission" >> _channelColor) call BIS_fnc_colorConfigToRGBA;
             private _index = _channelCtrl lbAdd (localize _channelText);
             _channelCtrl lbSetValue [_index, _channelID];
             _channelCtrl lbSetColor [_index, _selectionColor];
         };
-    } count _channelDropdownArray;
+    } forEach _channelDropdownArray;
 };
 
 private _suspectedCbCtrl = _mainDisplay displayCtrl SUSPECT_CHECKBOX;
@@ -236,7 +238,8 @@ if ((ctrlIDD _curMapDisplay) in [MAP_BRIEFING_CLIENT_DISPLAY, MAP_BRIEFING_SERVE
     _mod1Ctrl,
     _mod2Ctrl,
     _echelonCtrl,
-    _directionCtrl];
+    _directionCtrl
+];
 
 {
     _x ctrlAddEventHandler ["CheckedChanged", {[false] call FUNC(transmitUIData);}];

addons/markers/functions/fnc_moveMarkerInProgress.sqf

@@ -3,7 +3,7 @@
  *  Author: Timi007
  *
  *  Description:
- *      Event triggerd when marker is being moved.
+ *      Event triggered when marker is being moved.
  *
  *  Parameter(s):
  *      0: ARRAY - Arguments for the PerFrameHandler.

addons/markers/functions/fnc_moveMarkerInProgress3DEN.sqf

@@ -3,7 +3,7 @@
  *  Author: PhILoX
  *
  *  Description:
- *      Event triggerd when marker is being moved in 3DEN editor.
+ *      Event triggered when marker is being moved in 3DEN editor.
  *
  *  Parameter(s):
  *      None.

addons/markers/functions/fnc_moveMarkerMouseDown.sqf

@@ -3,7 +3,7 @@
  *  Author: PhILoX, Timi007
  *
  *  Description:
- *      Event triggerd when mouse button is pressed on map to start moving the marker.
+ *      Event triggered when mouse button is pressed on map to start moving the marker.
  *
  *  Parameter(s):
  *      0: CONTROL - Map control. (Optional, default: Map control)

addons/markers/functions/fnc_saveAndDisplayDTG.sqf

@@ -20,6 +20,6 @@ params ["_dateTimeGroup"];
 
 private _dtgButton = (findDisplay MAIN_DISPLAY) displayCtrl DTG_BUTTON;
 
-private _dtgChars = _dateTimeGroup call FUNC(toDTGCharaters);
+private _dtgChars = _dateTimeGroup call FUNC(toDTGCharacters);
 _dtgButton ctrlSetText (_dtgChars joinString "");
 _dtgButton setVariable [QGVAR(dateTimeGroup), _dateTimeGroup];

addons/markers/functions/fnc_setMarkerAlpha.sqf

@@ -3,7 +3,7 @@
  *  Author: Timi007
  *
  *  Description:
- *      Sets the transparancy (alpha) value of given marker.
+ *      Sets the transparency (alpha) value of given marker.
  *      When alpha equals 1, the marker is visible, but if alpha equals 0, then the marker is invisible.
  *
  *  Parameter(s):

addons/markers/functions/fnc_setMarkerAlphaLocal.sqf

@@ -3,7 +3,7 @@
  *  Author: Timi007
  *
  *  Description:
- *      Sets the transparancy (alpha) value of given marker.
+ *      Sets the transparency (alpha) value of given marker.
  *      When alpha equals 1, the marker is visible, but if alpha equals 0, then the marker is invisible.
  *      This function has a local effect.
  *

addons/markers/functions/fnc_toDTGCharaters.sqf → addons/markers/functions/fnc_toDTGCharacters.sqf

@@ -3,20 +3,20 @@
  *  Author: Timi007
  *
  *  Description:
- *      Constructs and returns the Date-Time Group charaters.
+ *      Constructs and returns the Date-Time Group characters.
  *
  *  Parameter(s):
  *      0: ARRAY - Year, month, day, hours, minutes from date, systemTime or systemTimeUTC command.
  *      1: STRING - Standard time zone identifier (one character).
  *      2: BOOLEAN - Display in short format (HHMMZ) (Default: false).
  *
  *  Returns:
- *      ARRAY - Date-Time Group charaters in format [D, D, H, H, M, M, Z, mmm, Y, Y] (long) or [H, H, M, M, Z] (short).
+ *      ARRAY - Date-Time Group characters in format [D, D, H, H, M, M, Z, mmm, Y, Y] (long) or [H, H, M, M, Z] (short).
  *              To get the equivalent string, just join the element with joinString "".
  *              Returns empty array on invalid date.
  *
  *  Example:
- *      [[2023, 12, 7, 12, 35], "A"] call mts_markers_fnc_toDTGCharaters
+ *      [[2023, 12, 7, 12, 35], "A"] call mts_markers_fnc_toDTGCharacters
  *
  */
 
@@ -47,7 +47,7 @@ if (_displayShort) exitWith {
 };
 
 private _dayStr = [_day, 2] call CBA_fnc_formatNumber;
-private _monthAbbrivation = GVAR(monthAbbreviations) get _month;
+private _monthAbbreviation = GVAR(monthAbbreviations) get _month;
 private _yearStr = [_year, 4] call CBA_fnc_formatNumber;
 
 // Long format DDHHMMZmmmYY
@@ -59,7 +59,7 @@ private _yearStr = [_year, 4] call CBA_fnc_formatNumber;
     _minuteStr select [0, 1],
     _minuteStr select [1, 1],
     toUpper _timeZone,
-    toLower _monthAbbrivation,
+    toLower _monthAbbreviation,
     _yearStr select [2, 1],
     _yearStr select [3, 1]
 ]

addons/markers/functions/fnc_transmitUIData.sqf

@@ -24,7 +24,7 @@ private _mainDisplay = findDisplay MAIN_DISPLAY;
 //get all data
 private _markerParameter = [] call FUNC(getUIData);
 
-//chose where the data will be transmited
+//chose where the data will be transmitted
 scopeName "main";
 if (_isForMarkerCreation) then {
     private _uniqueDesignation = _markerParameter param [3, []];

addons/markers/script_mod.hpp

@@ -12,7 +12,7 @@
 #define MTS_TAG MTS
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 2.14
+#define REQUIRED_VERSION 2.20
 #define REQUIRED_CBA_VERSION {3,16,1}
 
 #ifdef COMPONENT_BEAUTIFIED