Merge branch 'master' into release

README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/Metis-Team/mts_marker/releases/latest">
-        <img src="https://img.shields.io/badge/Version-1.5.0-blue.svg?style=flat-square" alt="Metis Marker Version">
+        <img src="https://img.shields.io/badge/Version-1.6.0-blue.svg?style=flat-square" alt="Metis Marker Version">
     </a>
     <a href="https://github.com/Metis-Team/mts_marker/releases/latest">
         <img src="https://img.shields.io/github/downloads/Metis-Team/mts_marker/total.svg?style=flat-square&label=Downloads" alt="Metis Marker Downloads">

addons/markers/CfgMarkers.hpp

@@ -17,6 +17,11 @@ class CfgMarkers {
     class mts_alphanum_##ANCHOR##_##POSITION##_##LETTER##: mts_blu_frameshape { \
         icon = QPATHTOF(data\alphanum\ANCHOR\POSITION\ALPHANUMMARKERFILE(ANCHOR,POSITION,LETTER)); \
     }
+    #define SPECIALCHARMARKERFILE(ANCHOR,POSITION,LETTER) mts_markers_special_##ANCHOR##_##POSITION##_##LETTER##.paa
+    #define SPECIALCHARMARKER(ANCHOR,POSITION,LETTER) \
+    class mts_special_##ANCHOR##_##POSITION##_##LETTER##: mts_blu_frameshape { \
+        icon = QPATHTOF(data\special\ANCHOR\POSITION\SPECIALCHARMARKERFILE(ANCHOR,POSITION,LETTER)); \
+    }
 
     class b_unknown;
     class o_unknown;
@@ -90,5 +95,5 @@ class CfgMarkers {
     #include "CfgMarkers\CfgMarkersNeutral.hpp"
     #include "CfgMarkers\CfgMarkersUnknown.hpp"
     #include "CfgMarkers\CfgMarkersCommon.hpp"
-    #include "CfgMarkers\CfgMarkersAlphanumeric.hpp"
+    #include "CfgMarkers\CfgMarkersCharacters.hpp"
 };

addons/markers/CfgMarkers/CfgMarkersAlphanumericLB.hpp

@@ -1,4 +1,4 @@
-// Alphanumeric markers for anchor lb
+// Character markers for anchor lb
 // This file is generated and should not be edited
 
 ALPHANUMMARKER(lb,0,A);

addons/markers/CfgMarkers/CfgMarkersAlphanumericRB.hpp

@@ -1,4 +1,4 @@
-// Alphanumeric markers for anchor rb
+// Character markers for anchor rb
 // This file is generated and should not be edited
 
 ALPHANUMMARKER(rb,0,A);

addons/markers/CfgMarkers/CfgMarkersAlphanumeric.hpp → addons/markers/CfgMarkers/CfgMarkersCharacters.hpp

@@ -1,2 +1,4 @@
 #include "CfgMarkersAlphanumericLB.hpp"
 #include "CfgMarkersAlphanumericRB.hpp"
+#include "CfgMarkersSpecialCharsLB.hpp"
+#include "CfgMarkersSpecialCharsRB.hpp"

addons/markers/CfgMarkers/CfgMarkersSpecialCharsLB.hpp

@@ -0,0 +1,135 @@
+// Character markers for anchor lb
+// This file is generated and should not be edited
+
+SPECIALCHARMARKER(lb,0,hash);
+SPECIALCHARMARKER(lb,0,slash);
+SPECIALCHARMARKER(lb,0,backslash);
+SPECIALCHARMARKER(lb,0,dot);
+SPECIALCHARMARKER(lb,0,plus);
+SPECIALCHARMARKER(lb,0,minus);
+SPECIALCHARMARKER(lb,0,space);
+SPECIALCHARMARKER(lb,0,parenthesesleft);
+SPECIALCHARMARKER(lb,0,parenthesesright);
+SPECIALCHARMARKER(lb,0,bracketsleft);
+SPECIALCHARMARKER(lb,0,bracketsright);
+SPECIALCHARMARKER(lb,0,bracesleft);
+SPECIALCHARMARKER(lb,0,bracesright);
+SPECIALCHARMARKER(lb,0,equal);
+SPECIALCHARMARKER(lb,0,tilde);
+SPECIALCHARMARKER(lb,0,colon);
+SPECIALCHARMARKER(lb,0,comma);
+SPECIALCHARMARKER(lb,0,pipe);
+SPECIALCHARMARKER(lb,0,asterisk);
+SPECIALCHARMARKER(lb,0,circumflex);
+SPECIALCHARMARKER(lb,0,underscore);
+
+SPECIALCHARMARKER(lb,1,hash);
+SPECIALCHARMARKER(lb,1,slash);
+SPECIALCHARMARKER(lb,1,backslash);
+SPECIALCHARMARKER(lb,1,dot);
+SPECIALCHARMARKER(lb,1,plus);
+SPECIALCHARMARKER(lb,1,minus);
+SPECIALCHARMARKER(lb,1,space);
+SPECIALCHARMARKER(lb,1,parenthesesleft);
+SPECIALCHARMARKER(lb,1,parenthesesright);
+SPECIALCHARMARKER(lb,1,bracketsleft);
+SPECIALCHARMARKER(lb,1,bracketsright);
+SPECIALCHARMARKER(lb,1,bracesleft);
+SPECIALCHARMARKER(lb,1,bracesright);
+SPECIALCHARMARKER(lb,1,equal);
+SPECIALCHARMARKER(lb,1,tilde);
+SPECIALCHARMARKER(lb,1,colon);
+SPECIALCHARMARKER(lb,1,comma);
+SPECIALCHARMARKER(lb,1,pipe);
+SPECIALCHARMARKER(lb,1,asterisk);
+SPECIALCHARMARKER(lb,1,circumflex);
+SPECIALCHARMARKER(lb,1,underscore);
+
+SPECIALCHARMARKER(lb,2,hash);
+SPECIALCHARMARKER(lb,2,slash);
+SPECIALCHARMARKER(lb,2,backslash);
+SPECIALCHARMARKER(lb,2,dot);
+SPECIALCHARMARKER(lb,2,plus);
+SPECIALCHARMARKER(lb,2,minus);
+SPECIALCHARMARKER(lb,2,space);
+SPECIALCHARMARKER(lb,2,parenthesesleft);
+SPECIALCHARMARKER(lb,2,parenthesesright);
+SPECIALCHARMARKER(lb,2,bracketsleft);
+SPECIALCHARMARKER(lb,2,bracketsright);
+SPECIALCHARMARKER(lb,2,bracesleft);
+SPECIALCHARMARKER(lb,2,bracesright);
+SPECIALCHARMARKER(lb,2,equal);
+SPECIALCHARMARKER(lb,2,tilde);
+SPECIALCHARMARKER(lb,2,colon);
+SPECIALCHARMARKER(lb,2,comma);
+SPECIALCHARMARKER(lb,2,pipe);
+SPECIALCHARMARKER(lb,2,asterisk);
+SPECIALCHARMARKER(lb,2,circumflex);
+SPECIALCHARMARKER(lb,2,underscore);
+
+SPECIALCHARMARKER(lb,3,hash);
+SPECIALCHARMARKER(lb,3,slash);
+SPECIALCHARMARKER(lb,3,backslash);
+SPECIALCHARMARKER(lb,3,dot);
+SPECIALCHARMARKER(lb,3,plus);
+SPECIALCHARMARKER(lb,3,minus);
+SPECIALCHARMARKER(lb,3,space);
+SPECIALCHARMARKER(lb,3,parenthesesleft);
+SPECIALCHARMARKER(lb,3,parenthesesright);
+SPECIALCHARMARKER(lb,3,bracketsleft);
+SPECIALCHARMARKER(lb,3,bracketsright);
+SPECIALCHARMARKER(lb,3,bracesleft);
+SPECIALCHARMARKER(lb,3,bracesright);
+SPECIALCHARMARKER(lb,3,equal);
+SPECIALCHARMARKER(lb,3,tilde);
+SPECIALCHARMARKER(lb,3,colon);
+SPECIALCHARMARKER(lb,3,comma);
+SPECIALCHARMARKER(lb,3,pipe);
+SPECIALCHARMARKER(lb,3,asterisk);
+SPECIALCHARMARKER(lb,3,circumflex);
+SPECIALCHARMARKER(lb,3,underscore);
+
+SPECIALCHARMARKER(lb,4,hash);
+SPECIALCHARMARKER(lb,4,slash);
+SPECIALCHARMARKER(lb,4,backslash);
+SPECIALCHARMARKER(lb,4,dot);
+SPECIALCHARMARKER(lb,4,plus);
+SPECIALCHARMARKER(lb,4,minus);
+SPECIALCHARMARKER(lb,4,space);
+SPECIALCHARMARKER(lb,4,parenthesesleft);
+SPECIALCHARMARKER(lb,4,parenthesesright);
+SPECIALCHARMARKER(lb,4,bracketsleft);
+SPECIALCHARMARKER(lb,4,bracketsright);
+SPECIALCHARMARKER(lb,4,bracesleft);
+SPECIALCHARMARKER(lb,4,bracesright);
+SPECIALCHARMARKER(lb,4,equal);
+SPECIALCHARMARKER(lb,4,tilde);
+SPECIALCHARMARKER(lb,4,colon);
+SPECIALCHARMARKER(lb,4,comma);
+SPECIALCHARMARKER(lb,4,pipe);
+SPECIALCHARMARKER(lb,4,asterisk);
+SPECIALCHARMARKER(lb,4,circumflex);
+SPECIALCHARMARKER(lb,4,underscore);
+
+SPECIALCHARMARKER(lb,5,hash);
+SPECIALCHARMARKER(lb,5,slash);
+SPECIALCHARMARKER(lb,5,backslash);
+SPECIALCHARMARKER(lb,5,dot);
+SPECIALCHARMARKER(lb,5,plus);
+SPECIALCHARMARKER(lb,5,minus);
+SPECIALCHARMARKER(lb,5,space);
+SPECIALCHARMARKER(lb,5,parenthesesleft);
+SPECIALCHARMARKER(lb,5,parenthesesright);
+SPECIALCHARMARKER(lb,5,bracketsleft);
+SPECIALCHARMARKER(lb,5,bracketsright);
+SPECIALCHARMARKER(lb,5,bracesleft);
+SPECIALCHARMARKER(lb,5,bracesright);
+SPECIALCHARMARKER(lb,5,equal);
+SPECIALCHARMARKER(lb,5,tilde);
+SPECIALCHARMARKER(lb,5,colon);
+SPECIALCHARMARKER(lb,5,comma);
+SPECIALCHARMARKER(lb,5,pipe);
+SPECIALCHARMARKER(lb,5,asterisk);
+SPECIALCHARMARKER(lb,5,circumflex);
+SPECIALCHARMARKER(lb,5,underscore);
+

addons/markers/CfgMarkers/CfgMarkersSpecialCharsRB.hpp

@@ -0,0 +1,135 @@
+// Character markers for anchor rb
+// This file is generated and should not be edited
+
+SPECIALCHARMARKER(rb,0,hash);
+SPECIALCHARMARKER(rb,0,slash);
+SPECIALCHARMARKER(rb,0,backslash);
+SPECIALCHARMARKER(rb,0,dot);
+SPECIALCHARMARKER(rb,0,plus);
+SPECIALCHARMARKER(rb,0,minus);
+SPECIALCHARMARKER(rb,0,space);
+SPECIALCHARMARKER(rb,0,parenthesesleft);
+SPECIALCHARMARKER(rb,0,parenthesesright);
+SPECIALCHARMARKER(rb,0,bracketsleft);
+SPECIALCHARMARKER(rb,0,bracketsright);
+SPECIALCHARMARKER(rb,0,bracesleft);
+SPECIALCHARMARKER(rb,0,bracesright);
+SPECIALCHARMARKER(rb,0,equal);
+SPECIALCHARMARKER(rb,0,tilde);
+SPECIALCHARMARKER(rb,0,colon);
+SPECIALCHARMARKER(rb,0,comma);
+SPECIALCHARMARKER(rb,0,pipe);
+SPECIALCHARMARKER(rb,0,asterisk);
+SPECIALCHARMARKER(rb,0,circumflex);
+SPECIALCHARMARKER(rb,0,underscore);
+
+SPECIALCHARMARKER(rb,1,hash);
+SPECIALCHARMARKER(rb,1,slash);
+SPECIALCHARMARKER(rb,1,backslash);
+SPECIALCHARMARKER(rb,1,dot);
+SPECIALCHARMARKER(rb,1,plus);
+SPECIALCHARMARKER(rb,1,minus);
+SPECIALCHARMARKER(rb,1,space);
+SPECIALCHARMARKER(rb,1,parenthesesleft);
+SPECIALCHARMARKER(rb,1,parenthesesright);
+SPECIALCHARMARKER(rb,1,bracketsleft);
+SPECIALCHARMARKER(rb,1,bracketsright);
+SPECIALCHARMARKER(rb,1,bracesleft);
+SPECIALCHARMARKER(rb,1,bracesright);
+SPECIALCHARMARKER(rb,1,equal);
+SPECIALCHARMARKER(rb,1,tilde);
+SPECIALCHARMARKER(rb,1,colon);
+SPECIALCHARMARKER(rb,1,comma);
+SPECIALCHARMARKER(rb,1,pipe);
+SPECIALCHARMARKER(rb,1,asterisk);
+SPECIALCHARMARKER(rb,1,circumflex);
+SPECIALCHARMARKER(rb,1,underscore);
+
+SPECIALCHARMARKER(rb,2,hash);
+SPECIALCHARMARKER(rb,2,slash);
+SPECIALCHARMARKER(rb,2,backslash);
+SPECIALCHARMARKER(rb,2,dot);
+SPECIALCHARMARKER(rb,2,plus);
+SPECIALCHARMARKER(rb,2,minus);
+SPECIALCHARMARKER(rb,2,space);
+SPECIALCHARMARKER(rb,2,parenthesesleft);
+SPECIALCHARMARKER(rb,2,parenthesesright);
+SPECIALCHARMARKER(rb,2,bracketsleft);
+SPECIALCHARMARKER(rb,2,bracketsright);
+SPECIALCHARMARKER(rb,2,bracesleft);
+SPECIALCHARMARKER(rb,2,bracesright);
+SPECIALCHARMARKER(rb,2,equal);
+SPECIALCHARMARKER(rb,2,tilde);
+SPECIALCHARMARKER(rb,2,colon);
+SPECIALCHARMARKER(rb,2,comma);
+SPECIALCHARMARKER(rb,2,pipe);
+SPECIALCHARMARKER(rb,2,asterisk);
+SPECIALCHARMARKER(rb,2,circumflex);
+SPECIALCHARMARKER(rb,2,underscore);
+
+SPECIALCHARMARKER(rb,3,hash);
+SPECIALCHARMARKER(rb,3,slash);
+SPECIALCHARMARKER(rb,3,backslash);
+SPECIALCHARMARKER(rb,3,dot);
+SPECIALCHARMARKER(rb,3,plus);
+SPECIALCHARMARKER(rb,3,minus);
+SPECIALCHARMARKER(rb,3,space);
+SPECIALCHARMARKER(rb,3,parenthesesleft);
+SPECIALCHARMARKER(rb,3,parenthesesright);
+SPECIALCHARMARKER(rb,3,bracketsleft);
+SPECIALCHARMARKER(rb,3,bracketsright);
+SPECIALCHARMARKER(rb,3,bracesleft);
+SPECIALCHARMARKER(rb,3,bracesright);
+SPECIALCHARMARKER(rb,3,equal);
+SPECIALCHARMARKER(rb,3,tilde);
+SPECIALCHARMARKER(rb,3,colon);
+SPECIALCHARMARKER(rb,3,comma);
+SPECIALCHARMARKER(rb,3,pipe);
+SPECIALCHARMARKER(rb,3,asterisk);
+SPECIALCHARMARKER(rb,3,circumflex);
+SPECIALCHARMARKER(rb,3,underscore);
+
+SPECIALCHARMARKER(rb,4,hash);
+SPECIALCHARMARKER(rb,4,slash);
+SPECIALCHARMARKER(rb,4,backslash);
+SPECIALCHARMARKER(rb,4,dot);
+SPECIALCHARMARKER(rb,4,plus);
+SPECIALCHARMARKER(rb,4,minus);
+SPECIALCHARMARKER(rb,4,space);
+SPECIALCHARMARKER(rb,4,parenthesesleft);
+SPECIALCHARMARKER(rb,4,parenthesesright);
+SPECIALCHARMARKER(rb,4,bracketsleft);
+SPECIALCHARMARKER(rb,4,bracketsright);
+SPECIALCHARMARKER(rb,4,bracesleft);
+SPECIALCHARMARKER(rb,4,bracesright);
+SPECIALCHARMARKER(rb,4,equal);
+SPECIALCHARMARKER(rb,4,tilde);
+SPECIALCHARMARKER(rb,4,colon);
+SPECIALCHARMARKER(rb,4,comma);
+SPECIALCHARMARKER(rb,4,pipe);
+SPECIALCHARMARKER(rb,4,asterisk);
+SPECIALCHARMARKER(rb,4,circumflex);
+SPECIALCHARMARKER(rb,4,underscore);
+
+SPECIALCHARMARKER(rb,5,hash);
+SPECIALCHARMARKER(rb,5,slash);
+SPECIALCHARMARKER(rb,5,backslash);
+SPECIALCHARMARKER(rb,5,dot);
+SPECIALCHARMARKER(rb,5,plus);
+SPECIALCHARMARKER(rb,5,minus);
+SPECIALCHARMARKER(rb,5,space);
+SPECIALCHARMARKER(rb,5,parenthesesleft);
+SPECIALCHARMARKER(rb,5,parenthesesright);
+SPECIALCHARMARKER(rb,5,bracketsleft);
+SPECIALCHARMARKER(rb,5,bracketsright);
+SPECIALCHARMARKER(rb,5,bracesleft);
+SPECIALCHARMARKER(rb,5,bracesright);
+SPECIALCHARMARKER(rb,5,equal);
+SPECIALCHARMARKER(rb,5,tilde);
+SPECIALCHARMARKER(rb,5,colon);
+SPECIALCHARMARKER(rb,5,comma);
+SPECIALCHARMARKER(rb,5,pipe);
+SPECIALCHARMARKER(rb,5,asterisk);
+SPECIALCHARMARKER(rb,5,circumflex);
+SPECIALCHARMARKER(rb,5,underscore);
+

addons/markers/XEH_PREP.hpp

@@ -11,6 +11,7 @@ PREP(generateUniquePrefix);
 PREP(getAllModifiers);
 PREP(getBroadcastChannel);
 PREP(getBroadcastTargets);
+PREP(getCharMarkerType);
 PREP(getDisplay);
 PREP(getMarkerFamily);
 PREP(getMouseOverMarkerPrefix);

addons/markers/XEH_preInit.sqf

@@ -24,6 +24,7 @@ CHECK(!hasInterface);
 #include "init3denKeybinds.hpp"
 #include "initSettings.hpp"
 #include "initMarkerVariables.hpp"
+#include "initCharacterMarkerVariables.hpp"
 
 // Corresponding vanilla colors for each identity
 GVAR(vanillaColorMap) = createHashMapFromArray [["blu", "colorBLUFOR"], ["red", "colorOPFOR"], ["neu", "colorIndependent"], ["unk", "ColorUNKNOWN"]];

addons/markers/functions/fnc_3denKeyHandler.sqf

@@ -42,10 +42,8 @@ switch (true) do {
 };
 
 private _inputModifiers = [_inputShift, _inputCtrl, _inputAlt];
-TRACE_2("", _inputKey, _inputModifiers);
 
 private _keybindInfo = [LLSTRING(cba_category_name), _cbaActionName] call CBA_fnc_getKeybind;
-TRACE_1("", _keybindInfo);
 
 private _code = if (_isDownHandler) then {
     _keybindInfo param [3, {}]

addons/markers/functions/fnc_createMarkerLocal.sqf

@@ -149,12 +149,14 @@ if (_additionalInfo isNotEqualTo "") then {
 
 // create text marker (bottom left of marker)
 if ((count _uniqueDesignation) > 0) then {
+    TRACE_1("uniqueDesignation input", _uniqueDesignation);
     scopeName "textLeftCreation";
     //only take the first three characters of the left text
     if ((count _uniqueDesignation) > UNIQUE_DESIGNATION_MAX_CHARS) then {
         _uniqueDesignation resize UNIQUE_DESIGNATION_MAX_CHARS;
     };
 
+
     //check if all characters are valid & make all characters uppercase
     {
         _x = toUpper _x;
@@ -172,8 +174,11 @@ if ((count _uniqueDesignation) > 0) then {
 
     for "_numIndex" from ((count _uniqueDesignation) - 1) to 0 step -1 do {
         private _letter = _uniqueDesignation select _numIndex;
-        private _letterType = format ["mts_alphanum_lb_%1_%2", _letterPos, _letter];
-        private _markerUniqueDesignation = createMarkerLocal [format ["%1_alphanum_lb_%2_%3", _namePrefix, _letterPos, _letter], _pos];
+
+        ([_namePrefix, "uniqueDesignation", _letterPos, _letter] call FUNC(getCharMarkerType)) params ["_letterType", "_markerName"];
+        TRACE_3("uniqueDesignation", _letter, _letterType, _markerName);
+
+        private _markerUniqueDesignation = createMarkerLocal [_markerName, _pos];
         _markerUniqueDesignation setMarkerTypeLocal _letterType;
         _markerUniqueDesignation setMarkerSizeLocal [_scale, _scale];
 
@@ -185,6 +190,8 @@ if ((count _uniqueDesignation) > 0) then {
 
 // create text marker (bottom right of marker)
 if ((count _higherFormation) > 0) then {
+    TRACE_1("higherFormation input", _higherFormation);
+
     scopeName "textRightCreation";
     //only take the first three characters of the left text
     if ((count _higherFormation) > HIGHER_FORMATION_MAX_CHARS) then {
@@ -205,8 +212,11 @@ if ((count _higherFormation) > 0) then {
 
     {
         private _letter = _x;
-        private _letterType = format ["mts_alphanum_rb_%1_%2", _forEachIndex, _letter];
-        private _markerHigherFormation = createMarkerLocal [format ["%1_alphanum_rb_%2_%3", _namePrefix, _forEachIndex, _letter], _pos];
+
+        ([_namePrefix, "higherFormation", _forEachIndex, _letter] call FUNC(getCharMarkerType)) params ["_letterType", "_markerName"];
+        TRACE_3("higherFormation", _letter, _letterType, _markerName);
+
+        private _markerHigherFormation = createMarkerLocal [_markerName, _pos];
         _markerHigherFormation setMarkerTypeLocal _letterType;
         _markerHigherFormation setMarkerSizeLocal [_scale, _scale];