diff --git a/addons/markers/CfgMarkers.hpp b/addons/markers/CfgMarkers.hpp index 341b0e5..ec5c24b 100644 --- a/addons/markers/CfgMarkers.hpp +++ b/addons/markers/CfgMarkers.hpp @@ -1,47 +1,60 @@ -class CfgMarkers { - #define MARKERFILE(TYPE,MODIFIER,NAME) mts_markers_##TYPE##_##MODIFIER##_##NAME##.paa - #define MARKER(TYPE,MODIFIER,NAME) \ - class mts_##TYPE##_##MODIFIER##_##NAME##: mts_##TYPE##_frameshape { \ - icon = QPATHTOF(data\TYPE\MODIFIER\MARKERFILE(TYPE,MODIFIER,NAME)); \ - } +#define IDENTITY_MARKER(IDENTITY,MODIFIER,NAME) \ +class mts_##IDENTITY##_##MODIFIER##_##NAME##: mts_##IDENTITY##_frameshape { \ + icon = QPATHTOF(data\IDENTITY\MODIFIER\mts_markers_##IDENTITY##_##MODIFIER##_##NAME##.paa); \ +} + +// Default marker +#define MARKER(MODIFIER,NAME) \ + IDENTITY_MARKER(blu,MODIFIER,NAME); \ + IDENTITY_MARKER(red,MODIFIER,NAME); \ + IDENTITY_MARKER(neu,MODIFIER,NAME); \ + IDENTITY_MARKER(unk,MODIFIER,NAME) - // Common markers - #define COMMARKER(MODIFIER,NAME) \ - class mts_com_##MODIFIER##_##NAME##: mts_blu_frameshape { \ - icon = QPATHTOF(data\com\MODIFIER\MARKERFILE(com,MODIFIER,NAME)); \ - } +// Common markers +#define COM_MARKER(MODIFIER,NAME) \ +class mts_com_##MODIFIER##_##NAME##: mts_blu_frameshape { \ + icon = QPATHTOF(data\com\MODIFIER\mts_markers_com_##MODIFIER##_##NAME##.paa); \ +} - // Character markers - #define ALPHANUMMARKERFILE(ANCHOR,POSITION,LETTER) mts_markers_alphanum_##ANCHOR##_##POSITION##_##LETTER##.paa - #define ALPHANUMMARKER(ANCHOR,POSITION,LETTER) \ - 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)); \ - } +// Character markers +#define ALPHANUM_MARKER(ANCHOR,POSITION,LETTER) \ +class mts_alphanum_##ANCHOR##_##POSITION##_##LETTER##: mts_blu_frameshape { \ + icon = QPATHTOF(data\alphanum\ANCHOR\POSITION\mts_markers_alphanum_##ANCHOR##_##POSITION##_##LETTER##.paa); \ +} +#define SPECIAL_CHAR_MARKER(ANCHOR,POSITION,LETTER) \ +class mts_special_##ANCHOR##_##POSITION##_##LETTER##: mts_blu_frameshape { \ + icon = QPATHTOF(data\special\ANCHOR\POSITION\mts_markers_special_##ANCHOR##_##POSITION##_##LETTER##.paa); \ +} - // Date-Time Group markers - #define DTGMARKERFILE(POSITION,LETTER) mts_markers_dtg_##POSITION##_##LETTER##.paa - #define DTGMARKER(POSITION,LETTER) \ - class mts_dtg_##POSITION##_##LETTER##: mts_blu_frameshape { \ - icon = QPATHTOF(data\dtg\POSITION\DTGMARKERFILE(POSITION,LETTER)); \ - } +// Date-Time Group markers +#define DTG_MARKER(POSITION,LETTER) \ +class mts_dtg_##POSITION##_##LETTER##: mts_blu_frameshape { \ + icon = QPATHTOF(data\dtg\POSITION\mts_markers_dtg_##POSITION##_##LETTER##.paa); \ +} - // Direction of Movement markers - #define DIRMARKERFILE(TYPE,DIRECTION) mts_markers_##TYPE##_dir_##DIRECTION##.paa - #define DIRMARKER(TYPE,DIRECTION) \ - class mts_##TYPE##_dir_##DIRECTION##: mts_##TYPE##_frameshape { \ - icon = QPATHTOF(data\TYPE\dir\DIRMARKERFILE(TYPE,DIRECTION)); \ - } - #define ALTDIRMARKERFILE(TYPE,MOD,DIRECTION) mts_markers_##TYPE##_dir_##MOD##_##DIRECTION##.paa - #define ALTDIRMARKER(TYPE,MOD,DIRECTION) \ - class mts_##TYPE##_dir_##MOD##_##DIRECTION##: mts_##TYPE##_frameshape { \ - icon = QPATHTOF(data\TYPE\dir\MOD\ALTDIRMARKERFILE(TYPE,MOD,DIRECTION)); \ - } +// Direction of Movement markers +#define IDENTITY_DIR_MARKER(IDENTITY,DIRECTION) \ +class mts_##IDENTITY##_dir_##DIRECTION##: mts_##IDENTITY##_frameshape { \ + icon = QPATHTOF(data\IDENTITY\dir\mts_markers_##IDENTITY##_dir_##DIRECTION##.paa); \ +} +#define DIR_MARKER(DIRECTION) \ + IDENTITY_DIR_MARKER(blu,DIRECTION); \ + IDENTITY_DIR_MARKER(red,DIRECTION); \ + IDENTITY_DIR_MARKER(neu,DIRECTION); \ + IDENTITY_DIR_MARKER(unk,DIRECTION) +// Direction of Movement markers for modifications (e.g. HQ) +#define IDENTITY_ALT_DIR_MARKER(IDENTITY,MOD,DIRECTION) \ +class mts_##IDENTITY##_dir_##MOD##_##DIRECTION##: mts_##IDENTITY##_frameshape { \ + icon = QPATHTOF(data\IDENTITY\dir\MOD\mts_markers_##IDENTITY##_dir_##MOD##_##DIRECTION##.paa); \ +} +#define DIR_MOD_MARKER(MOD,DIRECTION) \ + IDENTITY_ALT_DIR_MARKER(blu,MOD,DIRECTION); \ + IDENTITY_ALT_DIR_MARKER(red,MOD,DIRECTION); \ + IDENTITY_ALT_DIR_MARKER(neu,MOD,DIRECTION); \ + IDENTITY_ALT_DIR_MARKER(unk,MOD,DIRECTION) + +class CfgMarkers { class b_unknown; class o_unknown; class n_unknown; @@ -121,11 +134,9 @@ class CfgMarkers { size = 32; }; - #include "CfgMarkers\CfgMarkersBlufor.hpp" - #include "CfgMarkers\CfgMarkersRedfor.hpp" - #include "CfgMarkers\CfgMarkersNeutral.hpp" - #include "CfgMarkers\CfgMarkersUnknown.hpp" + #include "CfgMarkers\CfgMarkersIconsModifier.hpp" #include "CfgMarkers\CfgMarkersCommon.hpp" #include "CfgMarkers\CfgMarkersCharacters.hpp" #include "CfgMarkers\CfgMarkersDateTimeGroup.hpp" + #include "CfgMarkers\CfgMarkersDirections.hpp" }; diff --git a/addons/markers/CfgMarkers/CfgMarkersAlphanumericLB.hpp b/addons/markers/CfgMarkers/CfgMarkersAlphanumericLB.hpp index 58d263f..0e73cef 100644 --- a/addons/markers/CfgMarkers/CfgMarkersAlphanumericLB.hpp +++ b/addons/markers/CfgMarkers/CfgMarkersAlphanumericLB.hpp @@ -1,225 +1,227 @@ +// ------------------------------------------------ // Character markers for anchor lb -// This file is generated and should not be edited +// This file is generated and should not be edited! +// ------------------------------------------------ -ALPHANUMMARKER(lb,0,A); -ALPHANUMMARKER(lb,0,B); -ALPHANUMMARKER(lb,0,C); -ALPHANUMMARKER(lb,0,D); -ALPHANUMMARKER(lb,0,E); -ALPHANUMMARKER(lb,0,F); -ALPHANUMMARKER(lb,0,G); -ALPHANUMMARKER(lb,0,H); -ALPHANUMMARKER(lb,0,I); -ALPHANUMMARKER(lb,0,J); -ALPHANUMMARKER(lb,0,K); -ALPHANUMMARKER(lb,0,L); -ALPHANUMMARKER(lb,0,M); -ALPHANUMMARKER(lb,0,N); -ALPHANUMMARKER(lb,0,O); -ALPHANUMMARKER(lb,0,P); -ALPHANUMMARKER(lb,0,Q); -ALPHANUMMARKER(lb,0,R); -ALPHANUMMARKER(lb,0,S); -ALPHANUMMARKER(lb,0,T); -ALPHANUMMARKER(lb,0,U); -ALPHANUMMARKER(lb,0,V); -ALPHANUMMARKER(lb,0,W); -ALPHANUMMARKER(lb,0,X); -ALPHANUMMARKER(lb,0,Y); -ALPHANUMMARKER(lb,0,Z); -ALPHANUMMARKER(lb,0,0); -ALPHANUMMARKER(lb,0,1); -ALPHANUMMARKER(lb,0,2); -ALPHANUMMARKER(lb,0,3); -ALPHANUMMARKER(lb,0,4); -ALPHANUMMARKER(lb,0,5); -ALPHANUMMARKER(lb,0,6); -ALPHANUMMARKER(lb,0,7); -ALPHANUMMARKER(lb,0,8); -ALPHANUMMARKER(lb,0,9); +ALPHANUM_MARKER(lb,0,A); +ALPHANUM_MARKER(lb,0,B); +ALPHANUM_MARKER(lb,0,C); +ALPHANUM_MARKER(lb,0,D); +ALPHANUM_MARKER(lb,0,E); +ALPHANUM_MARKER(lb,0,F); +ALPHANUM_MARKER(lb,0,G); +ALPHANUM_MARKER(lb,0,H); +ALPHANUM_MARKER(lb,0,I); +ALPHANUM_MARKER(lb,0,J); +ALPHANUM_MARKER(lb,0,K); +ALPHANUM_MARKER(lb,0,L); +ALPHANUM_MARKER(lb,0,M); +ALPHANUM_MARKER(lb,0,N); +ALPHANUM_MARKER(lb,0,O); +ALPHANUM_MARKER(lb,0,P); +ALPHANUM_MARKER(lb,0,Q); +ALPHANUM_MARKER(lb,0,R); +ALPHANUM_MARKER(lb,0,S); +ALPHANUM_MARKER(lb,0,T); +ALPHANUM_MARKER(lb,0,U); +ALPHANUM_MARKER(lb,0,V); +ALPHANUM_MARKER(lb,0,W); +ALPHANUM_MARKER(lb,0,X); +ALPHANUM_MARKER(lb,0,Y); +ALPHANUM_MARKER(lb,0,Z); +ALPHANUM_MARKER(lb,0,0); +ALPHANUM_MARKER(lb,0,1); +ALPHANUM_MARKER(lb,0,2); +ALPHANUM_MARKER(lb,0,3); +ALPHANUM_MARKER(lb,0,4); +ALPHANUM_MARKER(lb,0,5); +ALPHANUM_MARKER(lb,0,6); +ALPHANUM_MARKER(lb,0,7); +ALPHANUM_MARKER(lb,0,8); +ALPHANUM_MARKER(lb,0,9); -ALPHANUMMARKER(lb,1,A); -ALPHANUMMARKER(lb,1,B); -ALPHANUMMARKER(lb,1,C); -ALPHANUMMARKER(lb,1,D); -ALPHANUMMARKER(lb,1,E); -ALPHANUMMARKER(lb,1,F); -ALPHANUMMARKER(lb,1,G); -ALPHANUMMARKER(lb,1,H); -ALPHANUMMARKER(lb,1,I); -ALPHANUMMARKER(lb,1,J); -ALPHANUMMARKER(lb,1,K); -ALPHANUMMARKER(lb,1,L); -ALPHANUMMARKER(lb,1,M); -ALPHANUMMARKER(lb,1,N); -ALPHANUMMARKER(lb,1,O); -ALPHANUMMARKER(lb,1,P); -ALPHANUMMARKER(lb,1,Q); -ALPHANUMMARKER(lb,1,R); -ALPHANUMMARKER(lb,1,S); -ALPHANUMMARKER(lb,1,T); -ALPHANUMMARKER(lb,1,U); -ALPHANUMMARKER(lb,1,V); -ALPHANUMMARKER(lb,1,W); -ALPHANUMMARKER(lb,1,X); -ALPHANUMMARKER(lb,1,Y); -ALPHANUMMARKER(lb,1,Z); -ALPHANUMMARKER(lb,1,0); -ALPHANUMMARKER(lb,1,1); -ALPHANUMMARKER(lb,1,2); -ALPHANUMMARKER(lb,1,3); -ALPHANUMMARKER(lb,1,4); -ALPHANUMMARKER(lb,1,5); -ALPHANUMMARKER(lb,1,6); -ALPHANUMMARKER(lb,1,7); -ALPHANUMMARKER(lb,1,8); -ALPHANUMMARKER(lb,1,9); +ALPHANUM_MARKER(lb,1,A); +ALPHANUM_MARKER(lb,1,B); +ALPHANUM_MARKER(lb,1,C); +ALPHANUM_MARKER(lb,1,D); +ALPHANUM_MARKER(lb,1,E); +ALPHANUM_MARKER(lb,1,F); +ALPHANUM_MARKER(lb,1,G); +ALPHANUM_MARKER(lb,1,H); +ALPHANUM_MARKER(lb,1,I); +ALPHANUM_MARKER(lb,1,J); +ALPHANUM_MARKER(lb,1,K); +ALPHANUM_MARKER(lb,1,L); +ALPHANUM_MARKER(lb,1,M); +ALPHANUM_MARKER(lb,1,N); +ALPHANUM_MARKER(lb,1,O); +ALPHANUM_MARKER(lb,1,P); +ALPHANUM_MARKER(lb,1,Q); +ALPHANUM_MARKER(lb,1,R); +ALPHANUM_MARKER(lb,1,S); +ALPHANUM_MARKER(lb,1,T); +ALPHANUM_MARKER(lb,1,U); +ALPHANUM_MARKER(lb,1,V); +ALPHANUM_MARKER(lb,1,W); +ALPHANUM_MARKER(lb,1,X); +ALPHANUM_MARKER(lb,1,Y); +ALPHANUM_MARKER(lb,1,Z); +ALPHANUM_MARKER(lb,1,0); +ALPHANUM_MARKER(lb,1,1); +ALPHANUM_MARKER(lb,1,2); +ALPHANUM_MARKER(lb,1,3); +ALPHANUM_MARKER(lb,1,4); +ALPHANUM_MARKER(lb,1,5); +ALPHANUM_MARKER(lb,1,6); +ALPHANUM_MARKER(lb,1,7); +ALPHANUM_MARKER(lb,1,8); +ALPHANUM_MARKER(lb,1,9); -ALPHANUMMARKER(lb,2,A); -ALPHANUMMARKER(lb,2,B); -ALPHANUMMARKER(lb,2,C); -ALPHANUMMARKER(lb,2,D); -ALPHANUMMARKER(lb,2,E); -ALPHANUMMARKER(lb,2,F); -ALPHANUMMARKER(lb,2,G); -ALPHANUMMARKER(lb,2,H); -ALPHANUMMARKER(lb,2,I); -ALPHANUMMARKER(lb,2,J); -ALPHANUMMARKER(lb,2,K); -ALPHANUMMARKER(lb,2,L); -ALPHANUMMARKER(lb,2,M); -ALPHANUMMARKER(lb,2,N); -ALPHANUMMARKER(lb,2,O); -ALPHANUMMARKER(lb,2,P); -ALPHANUMMARKER(lb,2,Q); -ALPHANUMMARKER(lb,2,R); -ALPHANUMMARKER(lb,2,S); -ALPHANUMMARKER(lb,2,T); -ALPHANUMMARKER(lb,2,U); -ALPHANUMMARKER(lb,2,V); -ALPHANUMMARKER(lb,2,W); -ALPHANUMMARKER(lb,2,X); -ALPHANUMMARKER(lb,2,Y); -ALPHANUMMARKER(lb,2,Z); -ALPHANUMMARKER(lb,2,0); -ALPHANUMMARKER(lb,2,1); -ALPHANUMMARKER(lb,2,2); -ALPHANUMMARKER(lb,2,3); -ALPHANUMMARKER(lb,2,4); -ALPHANUMMARKER(lb,2,5); -ALPHANUMMARKER(lb,2,6); -ALPHANUMMARKER(lb,2,7); -ALPHANUMMARKER(lb,2,8); -ALPHANUMMARKER(lb,2,9); +ALPHANUM_MARKER(lb,2,A); +ALPHANUM_MARKER(lb,2,B); +ALPHANUM_MARKER(lb,2,C); +ALPHANUM_MARKER(lb,2,D); +ALPHANUM_MARKER(lb,2,E); +ALPHANUM_MARKER(lb,2,F); +ALPHANUM_MARKER(lb,2,G); +ALPHANUM_MARKER(lb,2,H); +ALPHANUM_MARKER(lb,2,I); +ALPHANUM_MARKER(lb,2,J); +ALPHANUM_MARKER(lb,2,K); +ALPHANUM_MARKER(lb,2,L); +ALPHANUM_MARKER(lb,2,M); +ALPHANUM_MARKER(lb,2,N); +ALPHANUM_MARKER(lb,2,O); +ALPHANUM_MARKER(lb,2,P); +ALPHANUM_MARKER(lb,2,Q); +ALPHANUM_MARKER(lb,2,R); +ALPHANUM_MARKER(lb,2,S); +ALPHANUM_MARKER(lb,2,T); +ALPHANUM_MARKER(lb,2,U); +ALPHANUM_MARKER(lb,2,V); +ALPHANUM_MARKER(lb,2,W); +ALPHANUM_MARKER(lb,2,X); +ALPHANUM_MARKER(lb,2,Y); +ALPHANUM_MARKER(lb,2,Z); +ALPHANUM_MARKER(lb,2,0); +ALPHANUM_MARKER(lb,2,1); +ALPHANUM_MARKER(lb,2,2); +ALPHANUM_MARKER(lb,2,3); +ALPHANUM_MARKER(lb,2,4); +ALPHANUM_MARKER(lb,2,5); +ALPHANUM_MARKER(lb,2,6); +ALPHANUM_MARKER(lb,2,7); +ALPHANUM_MARKER(lb,2,8); +ALPHANUM_MARKER(lb,2,9); -ALPHANUMMARKER(lb,3,A); -ALPHANUMMARKER(lb,3,B); -ALPHANUMMARKER(lb,3,C); -ALPHANUMMARKER(lb,3,D); -ALPHANUMMARKER(lb,3,E); -ALPHANUMMARKER(lb,3,F); -ALPHANUMMARKER(lb,3,G); -ALPHANUMMARKER(lb,3,H); -ALPHANUMMARKER(lb,3,I); -ALPHANUMMARKER(lb,3,J); -ALPHANUMMARKER(lb,3,K); -ALPHANUMMARKER(lb,3,L); -ALPHANUMMARKER(lb,3,M); -ALPHANUMMARKER(lb,3,N); -ALPHANUMMARKER(lb,3,O); -ALPHANUMMARKER(lb,3,P); -ALPHANUMMARKER(lb,3,Q); -ALPHANUMMARKER(lb,3,R); -ALPHANUMMARKER(lb,3,S); -ALPHANUMMARKER(lb,3,T); -ALPHANUMMARKER(lb,3,U); -ALPHANUMMARKER(lb,3,V); -ALPHANUMMARKER(lb,3,W); -ALPHANUMMARKER(lb,3,X); -ALPHANUMMARKER(lb,3,Y); -ALPHANUMMARKER(lb,3,Z); -ALPHANUMMARKER(lb,3,0); -ALPHANUMMARKER(lb,3,1); -ALPHANUMMARKER(lb,3,2); -ALPHANUMMARKER(lb,3,3); -ALPHANUMMARKER(lb,3,4); -ALPHANUMMARKER(lb,3,5); -ALPHANUMMARKER(lb,3,6); -ALPHANUMMARKER(lb,3,7); -ALPHANUMMARKER(lb,3,8); -ALPHANUMMARKER(lb,3,9); +ALPHANUM_MARKER(lb,3,A); +ALPHANUM_MARKER(lb,3,B); +ALPHANUM_MARKER(lb,3,C); +ALPHANUM_MARKER(lb,3,D); +ALPHANUM_MARKER(lb,3,E); +ALPHANUM_MARKER(lb,3,F); +ALPHANUM_MARKER(lb,3,G); +ALPHANUM_MARKER(lb,3,H); +ALPHANUM_MARKER(lb,3,I); +ALPHANUM_MARKER(lb,3,J); +ALPHANUM_MARKER(lb,3,K); +ALPHANUM_MARKER(lb,3,L); +ALPHANUM_MARKER(lb,3,M); +ALPHANUM_MARKER(lb,3,N); +ALPHANUM_MARKER(lb,3,O); +ALPHANUM_MARKER(lb,3,P); +ALPHANUM_MARKER(lb,3,Q); +ALPHANUM_MARKER(lb,3,R); +ALPHANUM_MARKER(lb,3,S); +ALPHANUM_MARKER(lb,3,T); +ALPHANUM_MARKER(lb,3,U); +ALPHANUM_MARKER(lb,3,V); +ALPHANUM_MARKER(lb,3,W); +ALPHANUM_MARKER(lb,3,X); +ALPHANUM_MARKER(lb,3,Y); +ALPHANUM_MARKER(lb,3,Z); +ALPHANUM_MARKER(lb,3,0); +ALPHANUM_MARKER(lb,3,1); +ALPHANUM_MARKER(lb,3,2); +ALPHANUM_MARKER(lb,3,3); +ALPHANUM_MARKER(lb,3,4); +ALPHANUM_MARKER(lb,3,5); +ALPHANUM_MARKER(lb,3,6); +ALPHANUM_MARKER(lb,3,7); +ALPHANUM_MARKER(lb,3,8); +ALPHANUM_MARKER(lb,3,9); -ALPHANUMMARKER(lb,4,A); -ALPHANUMMARKER(lb,4,B); -ALPHANUMMARKER(lb,4,C); -ALPHANUMMARKER(lb,4,D); -ALPHANUMMARKER(lb,4,E); -ALPHANUMMARKER(lb,4,F); -ALPHANUMMARKER(lb,4,G); -ALPHANUMMARKER(lb,4,H); -ALPHANUMMARKER(lb,4,I); -ALPHANUMMARKER(lb,4,J); -ALPHANUMMARKER(lb,4,K); -ALPHANUMMARKER(lb,4,L); -ALPHANUMMARKER(lb,4,M); -ALPHANUMMARKER(lb,4,N); -ALPHANUMMARKER(lb,4,O); -ALPHANUMMARKER(lb,4,P); -ALPHANUMMARKER(lb,4,Q); -ALPHANUMMARKER(lb,4,R); -ALPHANUMMARKER(lb,4,S); -ALPHANUMMARKER(lb,4,T); -ALPHANUMMARKER(lb,4,U); -ALPHANUMMARKER(lb,4,V); -ALPHANUMMARKER(lb,4,W); -ALPHANUMMARKER(lb,4,X); -ALPHANUMMARKER(lb,4,Y); -ALPHANUMMARKER(lb,4,Z); -ALPHANUMMARKER(lb,4,0); -ALPHANUMMARKER(lb,4,1); -ALPHANUMMARKER(lb,4,2); -ALPHANUMMARKER(lb,4,3); -ALPHANUMMARKER(lb,4,4); -ALPHANUMMARKER(lb,4,5); -ALPHANUMMARKER(lb,4,6); -ALPHANUMMARKER(lb,4,7); -ALPHANUMMARKER(lb,4,8); -ALPHANUMMARKER(lb,4,9); +ALPHANUM_MARKER(lb,4,A); +ALPHANUM_MARKER(lb,4,B); +ALPHANUM_MARKER(lb,4,C); +ALPHANUM_MARKER(lb,4,D); +ALPHANUM_MARKER(lb,4,E); +ALPHANUM_MARKER(lb,4,F); +ALPHANUM_MARKER(lb,4,G); +ALPHANUM_MARKER(lb,4,H); +ALPHANUM_MARKER(lb,4,I); +ALPHANUM_MARKER(lb,4,J); +ALPHANUM_MARKER(lb,4,K); +ALPHANUM_MARKER(lb,4,L); +ALPHANUM_MARKER(lb,4,M); +ALPHANUM_MARKER(lb,4,N); +ALPHANUM_MARKER(lb,4,O); +ALPHANUM_MARKER(lb,4,P); +ALPHANUM_MARKER(lb,4,Q); +ALPHANUM_MARKER(lb,4,R); +ALPHANUM_MARKER(lb,4,S); +ALPHANUM_MARKER(lb,4,T); +ALPHANUM_MARKER(lb,4,U); +ALPHANUM_MARKER(lb,4,V); +ALPHANUM_MARKER(lb,4,W); +ALPHANUM_MARKER(lb,4,X); +ALPHANUM_MARKER(lb,4,Y); +ALPHANUM_MARKER(lb,4,Z); +ALPHANUM_MARKER(lb,4,0); +ALPHANUM_MARKER(lb,4,1); +ALPHANUM_MARKER(lb,4,2); +ALPHANUM_MARKER(lb,4,3); +ALPHANUM_MARKER(lb,4,4); +ALPHANUM_MARKER(lb,4,5); +ALPHANUM_MARKER(lb,4,6); +ALPHANUM_MARKER(lb,4,7); +ALPHANUM_MARKER(lb,4,8); +ALPHANUM_MARKER(lb,4,9); -ALPHANUMMARKER(lb,5,A); -ALPHANUMMARKER(lb,5,B); -ALPHANUMMARKER(lb,5,C); -ALPHANUMMARKER(lb,5,D); -ALPHANUMMARKER(lb,5,E); -ALPHANUMMARKER(lb,5,F); -ALPHANUMMARKER(lb,5,G); -ALPHANUMMARKER(lb,5,H); -ALPHANUMMARKER(lb,5,I); -ALPHANUMMARKER(lb,5,J); -ALPHANUMMARKER(lb,5,K); -ALPHANUMMARKER(lb,5,L); -ALPHANUMMARKER(lb,5,M); -ALPHANUMMARKER(lb,5,N); -ALPHANUMMARKER(lb,5,O); -ALPHANUMMARKER(lb,5,P); -ALPHANUMMARKER(lb,5,Q); -ALPHANUMMARKER(lb,5,R); -ALPHANUMMARKER(lb,5,S); -ALPHANUMMARKER(lb,5,T); -ALPHANUMMARKER(lb,5,U); -ALPHANUMMARKER(lb,5,V); -ALPHANUMMARKER(lb,5,W); -ALPHANUMMARKER(lb,5,X); -ALPHANUMMARKER(lb,5,Y); -ALPHANUMMARKER(lb,5,Z); -ALPHANUMMARKER(lb,5,0); -ALPHANUMMARKER(lb,5,1); -ALPHANUMMARKER(lb,5,2); -ALPHANUMMARKER(lb,5,3); -ALPHANUMMARKER(lb,5,4); -ALPHANUMMARKER(lb,5,5); -ALPHANUMMARKER(lb,5,6); -ALPHANUMMARKER(lb,5,7); -ALPHANUMMARKER(lb,5,8); -ALPHANUMMARKER(lb,5,9); +ALPHANUM_MARKER(lb,5,A); +ALPHANUM_MARKER(lb,5,B); +ALPHANUM_MARKER(lb,5,C); +ALPHANUM_MARKER(lb,5,D); +ALPHANUM_MARKER(lb,5,E); +ALPHANUM_MARKER(lb,5,F); +ALPHANUM_MARKER(lb,5,G); +ALPHANUM_MARKER(lb,5,H); +ALPHANUM_MARKER(lb,5,I); +ALPHANUM_MARKER(lb,5,J); +ALPHANUM_MARKER(lb,5,K); +ALPHANUM_MARKER(lb,5,L); +ALPHANUM_MARKER(lb,5,M); +ALPHANUM_MARKER(lb,5,N); +ALPHANUM_MARKER(lb,5,O); +ALPHANUM_MARKER(lb,5,P); +ALPHANUM_MARKER(lb,5,Q); +ALPHANUM_MARKER(lb,5,R); +ALPHANUM_MARKER(lb,5,S); +ALPHANUM_MARKER(lb,5,T); +ALPHANUM_MARKER(lb,5,U); +ALPHANUM_MARKER(lb,5,V); +ALPHANUM_MARKER(lb,5,W); +ALPHANUM_MARKER(lb,5,X); +ALPHANUM_MARKER(lb,5,Y); +ALPHANUM_MARKER(lb,5,Z); +ALPHANUM_MARKER(lb,5,0); +ALPHANUM_MARKER(lb,5,1); +ALPHANUM_MARKER(lb,5,2); +ALPHANUM_MARKER(lb,5,3); +ALPHANUM_MARKER(lb,5,4); +ALPHANUM_MARKER(lb,5,5); +ALPHANUM_MARKER(lb,5,6); +ALPHANUM_MARKER(lb,5,7); +ALPHANUM_MARKER(lb,5,8); +ALPHANUM_MARKER(lb,5,9); diff --git a/addons/markers/CfgMarkers/CfgMarkersAlphanumericRB.hpp b/addons/markers/CfgMarkers/CfgMarkersAlphanumericRB.hpp index 54d8e8a..8dcfb7c 100644 --- a/addons/markers/CfgMarkers/CfgMarkersAlphanumericRB.hpp +++ b/addons/markers/CfgMarkers/CfgMarkersAlphanumericRB.hpp @@ -1,225 +1,227 @@ +// ------------------------------------------------ // Character markers for anchor rb -// This file is generated and should not be edited +// This file is generated and should not be edited! +// ------------------------------------------------ -ALPHANUMMARKER(rb,0,A); -ALPHANUMMARKER(rb,0,B); -ALPHANUMMARKER(rb,0,C); -ALPHANUMMARKER(rb,0,D); -ALPHANUMMARKER(rb,0,E); -ALPHANUMMARKER(rb,0,F); -ALPHANUMMARKER(rb,0,G); -ALPHANUMMARKER(rb,0,H); -ALPHANUMMARKER(rb,0,I); -ALPHANUMMARKER(rb,0,J); -ALPHANUMMARKER(rb,0,K); -ALPHANUMMARKER(rb,0,L); -ALPHANUMMARKER(rb,0,M); -ALPHANUMMARKER(rb,0,N); -ALPHANUMMARKER(rb,0,O); -ALPHANUMMARKER(rb,0,P); -ALPHANUMMARKER(rb,0,Q); -ALPHANUMMARKER(rb,0,R); -ALPHANUMMARKER(rb,0,S); -ALPHANUMMARKER(rb,0,T); -ALPHANUMMARKER(rb,0,U); -ALPHANUMMARKER(rb,0,V); -ALPHANUMMARKER(rb,0,W); -ALPHANUMMARKER(rb,0,X); -ALPHANUMMARKER(rb,0,Y); -ALPHANUMMARKER(rb,0,Z); -ALPHANUMMARKER(rb,0,0); -ALPHANUMMARKER(rb,0,1); -ALPHANUMMARKER(rb,0,2); -ALPHANUMMARKER(rb,0,3); -ALPHANUMMARKER(rb,0,4); -ALPHANUMMARKER(rb,0,5); -ALPHANUMMARKER(rb,0,6); -ALPHANUMMARKER(rb,0,7); -ALPHANUMMARKER(rb,0,8); -ALPHANUMMARKER(rb,0,9); +ALPHANUM_MARKER(rb,0,A); +ALPHANUM_MARKER(rb,0,B); +ALPHANUM_MARKER(rb,0,C); +ALPHANUM_MARKER(rb,0,D); +ALPHANUM_MARKER(rb,0,E); +ALPHANUM_MARKER(rb,0,F); +ALPHANUM_MARKER(rb,0,G); +ALPHANUM_MARKER(rb,0,H); +ALPHANUM_MARKER(rb,0,I); +ALPHANUM_MARKER(rb,0,J); +ALPHANUM_MARKER(rb,0,K); +ALPHANUM_MARKER(rb,0,L); +ALPHANUM_MARKER(rb,0,M); +ALPHANUM_MARKER(rb,0,N); +ALPHANUM_MARKER(rb,0,O); +ALPHANUM_MARKER(rb,0,P); +ALPHANUM_MARKER(rb,0,Q); +ALPHANUM_MARKER(rb,0,R); +ALPHANUM_MARKER(rb,0,S); +ALPHANUM_MARKER(rb,0,T); +ALPHANUM_MARKER(rb,0,U); +ALPHANUM_MARKER(rb,0,V); +ALPHANUM_MARKER(rb,0,W); +ALPHANUM_MARKER(rb,0,X); +ALPHANUM_MARKER(rb,0,Y); +ALPHANUM_MARKER(rb,0,Z); +ALPHANUM_MARKER(rb,0,0); +ALPHANUM_MARKER(rb,0,1); +ALPHANUM_MARKER(rb,0,2); +ALPHANUM_MARKER(rb,0,3); +ALPHANUM_MARKER(rb,0,4); +ALPHANUM_MARKER(rb,0,5); +ALPHANUM_MARKER(rb,0,6); +ALPHANUM_MARKER(rb,0,7); +ALPHANUM_MARKER(rb,0,8); +ALPHANUM_MARKER(rb,0,9); -ALPHANUMMARKER(rb,1,A); -ALPHANUMMARKER(rb,1,B); -ALPHANUMMARKER(rb,1,C); -ALPHANUMMARKER(rb,1,D); -ALPHANUMMARKER(rb,1,E); -ALPHANUMMARKER(rb,1,F); -ALPHANUMMARKER(rb,1,G); -ALPHANUMMARKER(rb,1,H); -ALPHANUMMARKER(rb,1,I); -ALPHANUMMARKER(rb,1,J); -ALPHANUMMARKER(rb,1,K); -ALPHANUMMARKER(rb,1,L); -ALPHANUMMARKER(rb,1,M); -ALPHANUMMARKER(rb,1,N); -ALPHANUMMARKER(rb,1,O); -ALPHANUMMARKER(rb,1,P); -ALPHANUMMARKER(rb,1,Q); -ALPHANUMMARKER(rb,1,R); -ALPHANUMMARKER(rb,1,S); -ALPHANUMMARKER(rb,1,T); -ALPHANUMMARKER(rb,1,U); -ALPHANUMMARKER(rb,1,V); -ALPHANUMMARKER(rb,1,W); -ALPHANUMMARKER(rb,1,X); -ALPHANUMMARKER(rb,1,Y); -ALPHANUMMARKER(rb,1,Z); -ALPHANUMMARKER(rb,1,0); -ALPHANUMMARKER(rb,1,1); -ALPHANUMMARKER(rb,1,2); -ALPHANUMMARKER(rb,1,3); -ALPHANUMMARKER(rb,1,4); -ALPHANUMMARKER(rb,1,5); -ALPHANUMMARKER(rb,1,6); -ALPHANUMMARKER(rb,1,7); -ALPHANUMMARKER(rb,1,8); -ALPHANUMMARKER(rb,1,9); +ALPHANUM_MARKER(rb,1,A); +ALPHANUM_MARKER(rb,1,B); +ALPHANUM_MARKER(rb,1,C); +ALPHANUM_MARKER(rb,1,D); +ALPHANUM_MARKER(rb,1,E); +ALPHANUM_MARKER(rb,1,F); +ALPHANUM_MARKER(rb,1,G); +ALPHANUM_MARKER(rb,1,H); +ALPHANUM_MARKER(rb,1,I); +ALPHANUM_MARKER(rb,1,J); +ALPHANUM_MARKER(rb,1,K); +ALPHANUM_MARKER(rb,1,L); +ALPHANUM_MARKER(rb,1,M); +ALPHANUM_MARKER(rb,1,N); +ALPHANUM_MARKER(rb,1,O); +ALPHANUM_MARKER(rb,1,P); +ALPHANUM_MARKER(rb,1,Q); +ALPHANUM_MARKER(rb,1,R); +ALPHANUM_MARKER(rb,1,S); +ALPHANUM_MARKER(rb,1,T); +ALPHANUM_MARKER(rb,1,U); +ALPHANUM_MARKER(rb,1,V); +ALPHANUM_MARKER(rb,1,W); +ALPHANUM_MARKER(rb,1,X); +ALPHANUM_MARKER(rb,1,Y); +ALPHANUM_MARKER(rb,1,Z); +ALPHANUM_MARKER(rb,1,0); +ALPHANUM_MARKER(rb,1,1); +ALPHANUM_MARKER(rb,1,2); +ALPHANUM_MARKER(rb,1,3); +ALPHANUM_MARKER(rb,1,4); +ALPHANUM_MARKER(rb,1,5); +ALPHANUM_MARKER(rb,1,6); +ALPHANUM_MARKER(rb,1,7); +ALPHANUM_MARKER(rb,1,8); +ALPHANUM_MARKER(rb,1,9); -ALPHANUMMARKER(rb,2,A); -ALPHANUMMARKER(rb,2,B); -ALPHANUMMARKER(rb,2,C); -ALPHANUMMARKER(rb,2,D); -ALPHANUMMARKER(rb,2,E); -ALPHANUMMARKER(rb,2,F); -ALPHANUMMARKER(rb,2,G); -ALPHANUMMARKER(rb,2,H); -ALPHANUMMARKER(rb,2,I); -ALPHANUMMARKER(rb,2,J); -ALPHANUMMARKER(rb,2,K); -ALPHANUMMARKER(rb,2,L); -ALPHANUMMARKER(rb,2,M); -ALPHANUMMARKER(rb,2,N); -ALPHANUMMARKER(rb,2,O); -ALPHANUMMARKER(rb,2,P); -ALPHANUMMARKER(rb,2,Q); -ALPHANUMMARKER(rb,2,R); -ALPHANUMMARKER(rb,2,S); -ALPHANUMMARKER(rb,2,T); -ALPHANUMMARKER(rb,2,U); -ALPHANUMMARKER(rb,2,V); -ALPHANUMMARKER(rb,2,W); -ALPHANUMMARKER(rb,2,X); -ALPHANUMMARKER(rb,2,Y); -ALPHANUMMARKER(rb,2,Z); -ALPHANUMMARKER(rb,2,0); -ALPHANUMMARKER(rb,2,1); -ALPHANUMMARKER(rb,2,2); -ALPHANUMMARKER(rb,2,3); -ALPHANUMMARKER(rb,2,4); -ALPHANUMMARKER(rb,2,5); -ALPHANUMMARKER(rb,2,6); -ALPHANUMMARKER(rb,2,7); -ALPHANUMMARKER(rb,2,8); -ALPHANUMMARKER(rb,2,9); +ALPHANUM_MARKER(rb,2,A); +ALPHANUM_MARKER(rb,2,B); +ALPHANUM_MARKER(rb,2,C); +ALPHANUM_MARKER(rb,2,D); +ALPHANUM_MARKER(rb,2,E); +ALPHANUM_MARKER(rb,2,F); +ALPHANUM_MARKER(rb,2,G); +ALPHANUM_MARKER(rb,2,H); +ALPHANUM_MARKER(rb,2,I); +ALPHANUM_MARKER(rb,2,J); +ALPHANUM_MARKER(rb,2,K); +ALPHANUM_MARKER(rb,2,L); +ALPHANUM_MARKER(rb,2,M); +ALPHANUM_MARKER(rb,2,N); +ALPHANUM_MARKER(rb,2,O); +ALPHANUM_MARKER(rb,2,P); +ALPHANUM_MARKER(rb,2,Q); +ALPHANUM_MARKER(rb,2,R); +ALPHANUM_MARKER(rb,2,S); +ALPHANUM_MARKER(rb,2,T); +ALPHANUM_MARKER(rb,2,U); +ALPHANUM_MARKER(rb,2,V); +ALPHANUM_MARKER(rb,2,W); +ALPHANUM_MARKER(rb,2,X); +ALPHANUM_MARKER(rb,2,Y); +ALPHANUM_MARKER(rb,2,Z); +ALPHANUM_MARKER(rb,2,0); +ALPHANUM_MARKER(rb,2,1); +ALPHANUM_MARKER(rb,2,2); +ALPHANUM_MARKER(rb,2,3); +ALPHANUM_MARKER(rb,2,4); +ALPHANUM_MARKER(rb,2,5); +ALPHANUM_MARKER(rb,2,6); +ALPHANUM_MARKER(rb,2,7); +ALPHANUM_MARKER(rb,2,8); +ALPHANUM_MARKER(rb,2,9); -ALPHANUMMARKER(rb,3,A); -ALPHANUMMARKER(rb,3,B); -ALPHANUMMARKER(rb,3,C); -ALPHANUMMARKER(rb,3,D); -ALPHANUMMARKER(rb,3,E); -ALPHANUMMARKER(rb,3,F); -ALPHANUMMARKER(rb,3,G); -ALPHANUMMARKER(rb,3,H); -ALPHANUMMARKER(rb,3,I); -ALPHANUMMARKER(rb,3,J); -ALPHANUMMARKER(rb,3,K); -ALPHANUMMARKER(rb,3,L); -ALPHANUMMARKER(rb,3,M); -ALPHANUMMARKER(rb,3,N); -ALPHANUMMARKER(rb,3,O); -ALPHANUMMARKER(rb,3,P); -ALPHANUMMARKER(rb,3,Q); -ALPHANUMMARKER(rb,3,R); -ALPHANUMMARKER(rb,3,S); -ALPHANUMMARKER(rb,3,T); -ALPHANUMMARKER(rb,3,U); -ALPHANUMMARKER(rb,3,V); -ALPHANUMMARKER(rb,3,W); -ALPHANUMMARKER(rb,3,X); -ALPHANUMMARKER(rb,3,Y); -ALPHANUMMARKER(rb,3,Z); -ALPHANUMMARKER(rb,3,0); -ALPHANUMMARKER(rb,3,1); -ALPHANUMMARKER(rb,3,2); -ALPHANUMMARKER(rb,3,3); -ALPHANUMMARKER(rb,3,4); -ALPHANUMMARKER(rb,3,5); -ALPHANUMMARKER(rb,3,6); -ALPHANUMMARKER(rb,3,7); -ALPHANUMMARKER(rb,3,8); -ALPHANUMMARKER(rb,3,9); +ALPHANUM_MARKER(rb,3,A); +ALPHANUM_MARKER(rb,3,B); +ALPHANUM_MARKER(rb,3,C); +ALPHANUM_MARKER(rb,3,D); +ALPHANUM_MARKER(rb,3,E); +ALPHANUM_MARKER(rb,3,F); +ALPHANUM_MARKER(rb,3,G); +ALPHANUM_MARKER(rb,3,H); +ALPHANUM_MARKER(rb,3,I); +ALPHANUM_MARKER(rb,3,J); +ALPHANUM_MARKER(rb,3,K); +ALPHANUM_MARKER(rb,3,L); +ALPHANUM_MARKER(rb,3,M); +ALPHANUM_MARKER(rb,3,N); +ALPHANUM_MARKER(rb,3,O); +ALPHANUM_MARKER(rb,3,P); +ALPHANUM_MARKER(rb,3,Q); +ALPHANUM_MARKER(rb,3,R); +ALPHANUM_MARKER(rb,3,S); +ALPHANUM_MARKER(rb,3,T); +ALPHANUM_MARKER(rb,3,U); +ALPHANUM_MARKER(rb,3,V); +ALPHANUM_MARKER(rb,3,W); +ALPHANUM_MARKER(rb,3,X); +ALPHANUM_MARKER(rb,3,Y); +ALPHANUM_MARKER(rb,3,Z); +ALPHANUM_MARKER(rb,3,0); +ALPHANUM_MARKER(rb,3,1); +ALPHANUM_MARKER(rb,3,2); +ALPHANUM_MARKER(rb,3,3); +ALPHANUM_MARKER(rb,3,4); +ALPHANUM_MARKER(rb,3,5); +ALPHANUM_MARKER(rb,3,6); +ALPHANUM_MARKER(rb,3,7); +ALPHANUM_MARKER(rb,3,8); +ALPHANUM_MARKER(rb,3,9); -ALPHANUMMARKER(rb,4,A); -ALPHANUMMARKER(rb,4,B); -ALPHANUMMARKER(rb,4,C); -ALPHANUMMARKER(rb,4,D); -ALPHANUMMARKER(rb,4,E); -ALPHANUMMARKER(rb,4,F); -ALPHANUMMARKER(rb,4,G); -ALPHANUMMARKER(rb,4,H); -ALPHANUMMARKER(rb,4,I); -ALPHANUMMARKER(rb,4,J); -ALPHANUMMARKER(rb,4,K); -ALPHANUMMARKER(rb,4,L); -ALPHANUMMARKER(rb,4,M); -ALPHANUMMARKER(rb,4,N); -ALPHANUMMARKER(rb,4,O); -ALPHANUMMARKER(rb,4,P); -ALPHANUMMARKER(rb,4,Q); -ALPHANUMMARKER(rb,4,R); -ALPHANUMMARKER(rb,4,S); -ALPHANUMMARKER(rb,4,T); -ALPHANUMMARKER(rb,4,U); -ALPHANUMMARKER(rb,4,V); -ALPHANUMMARKER(rb,4,W); -ALPHANUMMARKER(rb,4,X); -ALPHANUMMARKER(rb,4,Y); -ALPHANUMMARKER(rb,4,Z); -ALPHANUMMARKER(rb,4,0); -ALPHANUMMARKER(rb,4,1); -ALPHANUMMARKER(rb,4,2); -ALPHANUMMARKER(rb,4,3); -ALPHANUMMARKER(rb,4,4); -ALPHANUMMARKER(rb,4,5); -ALPHANUMMARKER(rb,4,6); -ALPHANUMMARKER(rb,4,7); -ALPHANUMMARKER(rb,4,8); -ALPHANUMMARKER(rb,4,9); +ALPHANUM_MARKER(rb,4,A); +ALPHANUM_MARKER(rb,4,B); +ALPHANUM_MARKER(rb,4,C); +ALPHANUM_MARKER(rb,4,D); +ALPHANUM_MARKER(rb,4,E); +ALPHANUM_MARKER(rb,4,F); +ALPHANUM_MARKER(rb,4,G); +ALPHANUM_MARKER(rb,4,H); +ALPHANUM_MARKER(rb,4,I); +ALPHANUM_MARKER(rb,4,J); +ALPHANUM_MARKER(rb,4,K); +ALPHANUM_MARKER(rb,4,L); +ALPHANUM_MARKER(rb,4,M); +ALPHANUM_MARKER(rb,4,N); +ALPHANUM_MARKER(rb,4,O); +ALPHANUM_MARKER(rb,4,P); +ALPHANUM_MARKER(rb,4,Q); +ALPHANUM_MARKER(rb,4,R); +ALPHANUM_MARKER(rb,4,S); +ALPHANUM_MARKER(rb,4,T); +ALPHANUM_MARKER(rb,4,U); +ALPHANUM_MARKER(rb,4,V); +ALPHANUM_MARKER(rb,4,W); +ALPHANUM_MARKER(rb,4,X); +ALPHANUM_MARKER(rb,4,Y); +ALPHANUM_MARKER(rb,4,Z); +ALPHANUM_MARKER(rb,4,0); +ALPHANUM_MARKER(rb,4,1); +ALPHANUM_MARKER(rb,4,2); +ALPHANUM_MARKER(rb,4,3); +ALPHANUM_MARKER(rb,4,4); +ALPHANUM_MARKER(rb,4,5); +ALPHANUM_MARKER(rb,4,6); +ALPHANUM_MARKER(rb,4,7); +ALPHANUM_MARKER(rb,4,8); +ALPHANUM_MARKER(rb,4,9); -ALPHANUMMARKER(rb,5,A); -ALPHANUMMARKER(rb,5,B); -ALPHANUMMARKER(rb,5,C); -ALPHANUMMARKER(rb,5,D); -ALPHANUMMARKER(rb,5,E); -ALPHANUMMARKER(rb,5,F); -ALPHANUMMARKER(rb,5,G); -ALPHANUMMARKER(rb,5,H); -ALPHANUMMARKER(rb,5,I); -ALPHANUMMARKER(rb,5,J); -ALPHANUMMARKER(rb,5,K); -ALPHANUMMARKER(rb,5,L); -ALPHANUMMARKER(rb,5,M); -ALPHANUMMARKER(rb,5,N); -ALPHANUMMARKER(rb,5,O); -ALPHANUMMARKER(rb,5,P); -ALPHANUMMARKER(rb,5,Q); -ALPHANUMMARKER(rb,5,R); -ALPHANUMMARKER(rb,5,S); -ALPHANUMMARKER(rb,5,T); -ALPHANUMMARKER(rb,5,U); -ALPHANUMMARKER(rb,5,V); -ALPHANUMMARKER(rb,5,W); -ALPHANUMMARKER(rb,5,X); -ALPHANUMMARKER(rb,5,Y); -ALPHANUMMARKER(rb,5,Z); -ALPHANUMMARKER(rb,5,0); -ALPHANUMMARKER(rb,5,1); -ALPHANUMMARKER(rb,5,2); -ALPHANUMMARKER(rb,5,3); -ALPHANUMMARKER(rb,5,4); -ALPHANUMMARKER(rb,5,5); -ALPHANUMMARKER(rb,5,6); -ALPHANUMMARKER(rb,5,7); -ALPHANUMMARKER(rb,5,8); -ALPHANUMMARKER(rb,5,9); +ALPHANUM_MARKER(rb,5,A); +ALPHANUM_MARKER(rb,5,B); +ALPHANUM_MARKER(rb,5,C); +ALPHANUM_MARKER(rb,5,D); +ALPHANUM_MARKER(rb,5,E); +ALPHANUM_MARKER(rb,5,F); +ALPHANUM_MARKER(rb,5,G); +ALPHANUM_MARKER(rb,5,H); +ALPHANUM_MARKER(rb,5,I); +ALPHANUM_MARKER(rb,5,J); +ALPHANUM_MARKER(rb,5,K); +ALPHANUM_MARKER(rb,5,L); +ALPHANUM_MARKER(rb,5,M); +ALPHANUM_MARKER(rb,5,N); +ALPHANUM_MARKER(rb,5,O); +ALPHANUM_MARKER(rb,5,P); +ALPHANUM_MARKER(rb,5,Q); +ALPHANUM_MARKER(rb,5,R); +ALPHANUM_MARKER(rb,5,S); +ALPHANUM_MARKER(rb,5,T); +ALPHANUM_MARKER(rb,5,U); +ALPHANUM_MARKER(rb,5,V); +ALPHANUM_MARKER(rb,5,W); +ALPHANUM_MARKER(rb,5,X); +ALPHANUM_MARKER(rb,5,Y); +ALPHANUM_MARKER(rb,5,Z); +ALPHANUM_MARKER(rb,5,0); +ALPHANUM_MARKER(rb,5,1); +ALPHANUM_MARKER(rb,5,2); +ALPHANUM_MARKER(rb,5,3); +ALPHANUM_MARKER(rb,5,4); +ALPHANUM_MARKER(rb,5,5); +ALPHANUM_MARKER(rb,5,6); +ALPHANUM_MARKER(rb,5,7); +ALPHANUM_MARKER(rb,5,8); +ALPHANUM_MARKER(rb,5,9); diff --git a/addons/markers/CfgMarkers/CfgMarkersBlufor.hpp b/addons/markers/CfgMarkers/CfgMarkersBlufor.hpp deleted file mode 100644 index 337aa48..0000000 --- a/addons/markers/CfgMarkers/CfgMarkersBlufor.hpp +++ /dev/null @@ -1,86 +0,0 @@ -//Blufor Icon -MARKER(blu,mod,armor); -MARKER(blu,mod,infantry); -MARKER(blu,mod,motorized); -MARKER(blu,mod,reconnaissance); -MARKER(blu,mod,signal_unit); -MARKER(blu,mod,anti_armor); -MARKER(blu,mod,rotary_wing); -MARKER(blu,mod,uav); -MARKER(blu,mod,artillery); -MARKER(blu,mod,artillery_sp); -MARKER(blu,mod,mortar); -MARKER(blu,mod,mortar_armored); -MARKER(blu,mod,air_defence); -MARKER(blu,mod,missile); -MARKER(blu,mod,surface_surface); -MARKER(blu,mod,engineer); -MARKER(blu,mod,engineer_armored); -MARKER(blu,mod,maintenance); -MARKER(blu,mod,supply); -MARKER(blu,mod,transportation); -MARKER(blu,mod,cbrn); -MARKER(blu,mod,combat_service_support); -MARKER(blu,mod,fixed_wing); -MARKER(blu,mod,medical); -MARKER(blu,mod,military_police); -MARKER(blu,mod,military_intelligence); -MARKER(blu,mod,amphibious); -MARKER(blu,mod,joint_fire_support); -MARKER(blu,mod,naval); -MARKER(blu,mod,special_forces); -MARKER(blu,mod,special_operation_forces); -MARKER(blu,mod,combined_arms); -MARKER(blu,mod,radar); -MARKER(blu,mod,field_artillery_observer); -MARKER(blu,mod,eod); -MARKER(blu,mod,ranger); -MARKER(blu,mod,aviation_composite); -MARKER(blu,mod,electromagnetic_warfare); -MARKER(blu,mod,internal_security_force); -MARKER(blu,mod,isaf); -MARKER(blu,mod,liaison); -MARKER(blu,mod,main_gun_system); -MARKER(blu,mod,police); -MARKER(blu,mod,search_and_rescue); - -//Blufor Mod1 -MARKER(blu,mod,attack); -MARKER(blu,mod,air_assault); -MARKER(blu,mod,maintenance_top); -MARKER(blu,mod,multiple_rocket_launcher); -MARKER(blu,mod,single_rocket_launcher); -MARKER(blu,mod,sniper); -MARKER(blu,mod,headquarters); -MARKER(blu,mod,naval_top); -MARKER(blu,mod,radar_top); -MARKER(blu,mod,bridging); -MARKER(blu,mod,medevac); -MARKER(blu,mod,eod_top); - -//Blufor Mod2 -MARKER(blu,mod,airborne); -MARKER(blu,mod,mountain); -MARKER(blu,mod,light); -MARKER(blu,mod,medium); -MARKER(blu,mod,heavy); -MARKER(blu,mod,vstol); -MARKER(blu,mod,wheeled); -MARKER(blu,mod,towed); - -//Blufor Sizes -MARKER(blu,size,1); -MARKER(blu,size,2); -MARKER(blu,size,3); -MARKER(blu,size,4); -MARKER(blu,size,5); -MARKER(blu,size,6); -MARKER(blu,size,7); -MARKER(blu,size,8); -MARKER(blu,size,9); -MARKER(blu,size,10); -MARKER(blu,size,11); -MARKER(blu,size,12); - -//Blufor Direction of Movement -#include "CfgMarkersBluforDir.hpp" diff --git a/addons/markers/CfgMarkers/CfgMarkersBluforDir.hpp b/addons/markers/CfgMarkers/CfgMarkersBluforDir.hpp deleted file mode 100644 index c3cf3f7..0000000 --- a/addons/markers/CfgMarkers/CfgMarkersBluforDir.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// ------------------------------------------------ -// Character markers for Direction of Movement -// This file is generated and should not be edited! -// ------------------------------------------------ - -DIRMARKER(blu,N); -DIRMARKER(blu,NNE); -DIRMARKER(blu,NE); -DIRMARKER(blu,ENE); -DIRMARKER(blu,E); -DIRMARKER(blu,ESE); -DIRMARKER(blu,SE); -DIRMARKER(blu,SSE); -DIRMARKER(blu,S); -DIRMARKER(blu,SSW); -DIRMARKER(blu,SW); -DIRMARKER(blu,WSW); -DIRMARKER(blu,W); -DIRMARKER(blu,WNW); -DIRMARKER(blu,NW); -DIRMARKER(blu,NNW); - -ALTDIRMARKER(blu,hq,N); -ALTDIRMARKER(blu,hq,NNE); -ALTDIRMARKER(blu,hq,NE); -ALTDIRMARKER(blu,hq,ENE); -ALTDIRMARKER(blu,hq,E); -ALTDIRMARKER(blu,hq,ESE); -ALTDIRMARKER(blu,hq,SE); -ALTDIRMARKER(blu,hq,SSE); -ALTDIRMARKER(blu,hq,S); -ALTDIRMARKER(blu,hq,SSW); -ALTDIRMARKER(blu,hq,SW); -ALTDIRMARKER(blu,hq,WSW); -ALTDIRMARKER(blu,hq,W); -ALTDIRMARKER(blu,hq,WNW); -ALTDIRMARKER(blu,hq,NW); -ALTDIRMARKER(blu,hq,NNW); - diff --git a/addons/markers/CfgMarkers/CfgMarkersCommon.hpp b/addons/markers/CfgMarkers/CfgMarkersCommon.hpp index 8ec2ecf..07e1528 100644 --- a/addons/markers/CfgMarkers/CfgMarkersCommon.hpp +++ b/addons/markers/CfgMarkers/CfgMarkersCommon.hpp @@ -1,8 +1,8 @@ //Common Sizes Special -COMMARKER(size,reinforced); -COMMARKER(size,reduced); -COMMARKER(size,reinforced_reduced); +COM_MARKER(size,reinforced); +COM_MARKER(size,reduced); +COM_MARKER(size,reinforced_reduced); // Common Operational Condition -COMMARKER(opcond,damaged); -COMMARKER(opcond,destroyed); +COM_MARKER(opcond,damaged); +COM_MARKER(opcond,destroyed); diff --git a/addons/markers/CfgMarkers/CfgMarkersDateTimeGroup.hpp b/addons/markers/CfgMarkers/CfgMarkersDateTimeGroup.hpp index 047d78a..71953ac 100644 --- a/addons/markers/CfgMarkers/CfgMarkersDateTimeGroup.hpp +++ b/addons/markers/CfgMarkers/CfgMarkersDateTimeGroup.hpp @@ -3,161 +3,161 @@ // This file is generated and should not be edited! // ------------------------------------------------ -DTGMARKER(0,0); -DTGMARKER(0,1); -DTGMARKER(0,2); -DTGMARKER(0,3); -DTGMARKER(0,4); -DTGMARKER(0,5); -DTGMARKER(0,6); -DTGMARKER(0,7); -DTGMARKER(0,8); -DTGMARKER(0,9); -DTGMARKER(0,A); -DTGMARKER(0,B); -DTGMARKER(0,C); -DTGMARKER(0,D); -DTGMARKER(0,E); -DTGMARKER(0,F); -DTGMARKER(0,G); -DTGMARKER(0,H); -DTGMARKER(0,I); -DTGMARKER(0,J); -DTGMARKER(0,K); -DTGMARKER(0,L); -DTGMARKER(0,M); -DTGMARKER(0,N); -DTGMARKER(0,O); -DTGMARKER(0,P); -DTGMARKER(0,Q); -DTGMARKER(0,R); -DTGMARKER(0,S); -DTGMARKER(0,T); -DTGMARKER(0,U); -DTGMARKER(0,V); -DTGMARKER(0,W); -DTGMARKER(0,X); -DTGMARKER(0,Y); -DTGMARKER(0,Z); +DTG_MARKER(0,0); +DTG_MARKER(0,1); +DTG_MARKER(0,2); +DTG_MARKER(0,3); +DTG_MARKER(0,4); +DTG_MARKER(0,5); +DTG_MARKER(0,6); +DTG_MARKER(0,7); +DTG_MARKER(0,8); +DTG_MARKER(0,9); +DTG_MARKER(0,A); +DTG_MARKER(0,B); +DTG_MARKER(0,C); +DTG_MARKER(0,D); +DTG_MARKER(0,E); +DTG_MARKER(0,F); +DTG_MARKER(0,G); +DTG_MARKER(0,H); +DTG_MARKER(0,I); +DTG_MARKER(0,J); +DTG_MARKER(0,K); +DTG_MARKER(0,L); +DTG_MARKER(0,M); +DTG_MARKER(0,N); +DTG_MARKER(0,O); +DTG_MARKER(0,P); +DTG_MARKER(0,Q); +DTG_MARKER(0,R); +DTG_MARKER(0,S); +DTG_MARKER(0,T); +DTG_MARKER(0,U); +DTG_MARKER(0,V); +DTG_MARKER(0,W); +DTG_MARKER(0,X); +DTG_MARKER(0,Y); +DTG_MARKER(0,Z); -DTGMARKER(1,0); -DTGMARKER(1,1); -DTGMARKER(1,2); -DTGMARKER(1,3); -DTGMARKER(1,4); -DTGMARKER(1,5); -DTGMARKER(1,6); -DTGMARKER(1,7); -DTGMARKER(1,8); -DTGMARKER(1,9); +DTG_MARKER(1,0); +DTG_MARKER(1,1); +DTG_MARKER(1,2); +DTG_MARKER(1,3); +DTG_MARKER(1,4); +DTG_MARKER(1,5); +DTG_MARKER(1,6); +DTG_MARKER(1,7); +DTG_MARKER(1,8); +DTG_MARKER(1,9); -DTGMARKER(2,0); -DTGMARKER(2,1); -DTGMARKER(2,2); -DTGMARKER(2,3); -DTGMARKER(2,4); -DTGMARKER(2,5); -DTGMARKER(2,apr); -DTGMARKER(2,aug); -DTGMARKER(2,dec); -DTGMARKER(2,feb); -DTGMARKER(2,jan); -DTGMARKER(2,jul); -DTGMARKER(2,jun); -DTGMARKER(2,mar); -DTGMARKER(2,may); -DTGMARKER(2,nov); -DTGMARKER(2,oct); -DTGMARKER(2,sep); +DTG_MARKER(2,0); +DTG_MARKER(2,1); +DTG_MARKER(2,2); +DTG_MARKER(2,3); +DTG_MARKER(2,4); +DTG_MARKER(2,5); +DTG_MARKER(2,apr); +DTG_MARKER(2,aug); +DTG_MARKER(2,dec); +DTG_MARKER(2,feb); +DTG_MARKER(2,jan); +DTG_MARKER(2,jul); +DTG_MARKER(2,jun); +DTG_MARKER(2,mar); +DTG_MARKER(2,may); +DTG_MARKER(2,nov); +DTG_MARKER(2,oct); +DTG_MARKER(2,sep); -DTGMARKER(3,0); -DTGMARKER(3,1); -DTGMARKER(3,2); -DTGMARKER(3,3); -DTGMARKER(3,4); -DTGMARKER(3,5); -DTGMARKER(3,6); -DTGMARKER(3,7); -DTGMARKER(3,8); -DTGMARKER(3,9); +DTG_MARKER(3,0); +DTG_MARKER(3,1); +DTG_MARKER(3,2); +DTG_MARKER(3,3); +DTG_MARKER(3,4); +DTG_MARKER(3,5); +DTG_MARKER(3,6); +DTG_MARKER(3,7); +DTG_MARKER(3,8); +DTG_MARKER(3,9); -DTGMARKER(4,0); -DTGMARKER(4,1); -DTGMARKER(4,2); +DTG_MARKER(4,0); +DTG_MARKER(4,1); +DTG_MARKER(4,2); -DTGMARKER(5,A); -DTGMARKER(5,B); -DTGMARKER(5,C); -DTGMARKER(5,D); -DTGMARKER(5,E); -DTGMARKER(5,F); -DTGMARKER(5,G); -DTGMARKER(5,H); -DTGMARKER(5,I); -DTGMARKER(5,J); -DTGMARKER(5,K); -DTGMARKER(5,L); -DTGMARKER(5,M); -DTGMARKER(5,N); -DTGMARKER(5,O); -DTGMARKER(5,P); -DTGMARKER(5,Q); -DTGMARKER(5,R); -DTGMARKER(5,S); -DTGMARKER(5,T); -DTGMARKER(5,U); -DTGMARKER(5,V); -DTGMARKER(5,W); -DTGMARKER(5,X); -DTGMARKER(5,Y); -DTGMARKER(5,Z); +DTG_MARKER(5,A); +DTG_MARKER(5,B); +DTG_MARKER(5,C); +DTG_MARKER(5,D); +DTG_MARKER(5,E); +DTG_MARKER(5,F); +DTG_MARKER(5,G); +DTG_MARKER(5,H); +DTG_MARKER(5,I); +DTG_MARKER(5,J); +DTG_MARKER(5,K); +DTG_MARKER(5,L); +DTG_MARKER(5,M); +DTG_MARKER(5,N); +DTG_MARKER(5,O); +DTG_MARKER(5,P); +DTG_MARKER(5,Q); +DTG_MARKER(5,R); +DTG_MARKER(5,S); +DTG_MARKER(5,T); +DTG_MARKER(5,U); +DTG_MARKER(5,V); +DTG_MARKER(5,W); +DTG_MARKER(5,X); +DTG_MARKER(5,Y); +DTG_MARKER(5,Z); -DTGMARKER(6,0); -DTGMARKER(6,1); -DTGMARKER(6,2); -DTGMARKER(6,3); -DTGMARKER(6,4); -DTGMARKER(6,5); -DTGMARKER(6,6); -DTGMARKER(6,7); -DTGMARKER(6,8); -DTGMARKER(6,9); +DTG_MARKER(6,0); +DTG_MARKER(6,1); +DTG_MARKER(6,2); +DTG_MARKER(6,3); +DTG_MARKER(6,4); +DTG_MARKER(6,5); +DTG_MARKER(6,6); +DTG_MARKER(6,7); +DTG_MARKER(6,8); +DTG_MARKER(6,9); -DTGMARKER(7,0); -DTGMARKER(7,1); -DTGMARKER(7,2); -DTGMARKER(7,3); -DTGMARKER(7,4); -DTGMARKER(7,5); +DTG_MARKER(7,0); +DTG_MARKER(7,1); +DTG_MARKER(7,2); +DTG_MARKER(7,3); +DTG_MARKER(7,4); +DTG_MARKER(7,5); -DTGMARKER(8,0); -DTGMARKER(8,1); -DTGMARKER(8,2); -DTGMARKER(8,3); -DTGMARKER(8,4); -DTGMARKER(8,5); -DTGMARKER(8,6); -DTGMARKER(8,7); -DTGMARKER(8,8); -DTGMARKER(8,9); +DTG_MARKER(8,0); +DTG_MARKER(8,1); +DTG_MARKER(8,2); +DTG_MARKER(8,3); +DTG_MARKER(8,4); +DTG_MARKER(8,5); +DTG_MARKER(8,6); +DTG_MARKER(8,7); +DTG_MARKER(8,8); +DTG_MARKER(8,9); -DTGMARKER(9,0); -DTGMARKER(9,1); -DTGMARKER(9,2); +DTG_MARKER(9,0); +DTG_MARKER(9,1); +DTG_MARKER(9,2); -DTGMARKER(10,0); -DTGMARKER(10,1); -DTGMARKER(10,2); -DTGMARKER(10,3); -DTGMARKER(10,4); -DTGMARKER(10,5); -DTGMARKER(10,6); -DTGMARKER(10,7); -DTGMARKER(10,8); -DTGMARKER(10,9); +DTG_MARKER(10,0); +DTG_MARKER(10,1); +DTG_MARKER(10,2); +DTG_MARKER(10,3); +DTG_MARKER(10,4); +DTG_MARKER(10,5); +DTG_MARKER(10,6); +DTG_MARKER(10,7); +DTG_MARKER(10,8); +DTG_MARKER(10,9); -DTGMARKER(11,0); -DTGMARKER(11,1); -DTGMARKER(11,2); -DTGMARKER(11,3); +DTG_MARKER(11,0); +DTG_MARKER(11,1); +DTG_MARKER(11,2); +DTG_MARKER(11,3); diff --git a/addons/markers/CfgMarkers/CfgMarkersDirections.hpp b/addons/markers/CfgMarkers/CfgMarkersDirections.hpp new file mode 100644 index 0000000..12d4ab4 --- /dev/null +++ b/addons/markers/CfgMarkers/CfgMarkersDirections.hpp @@ -0,0 +1,39 @@ +// ------------------------------------------------ +// Character markers for Direction of Movement +// This file is generated and should not be edited! +// ------------------------------------------------ + +DIR_MARKER(N); +DIR_MARKER(NNE); +DIR_MARKER(NE); +DIR_MARKER(ENE); +DIR_MARKER(E); +DIR_MARKER(ESE); +DIR_MARKER(SE); +DIR_MARKER(SSE); +DIR_MARKER(S); +DIR_MARKER(SSW); +DIR_MARKER(SW); +DIR_MARKER(WSW); +DIR_MARKER(W); +DIR_MARKER(WNW); +DIR_MARKER(NW); +DIR_MARKER(NNW); + +DIR_MOD_MARKER(hq,N); +DIR_MOD_MARKER(hq,NNE); +DIR_MOD_MARKER(hq,NE); +DIR_MOD_MARKER(hq,ENE); +DIR_MOD_MARKER(hq,E); +DIR_MOD_MARKER(hq,ESE); +DIR_MOD_MARKER(hq,SE); +DIR_MOD_MARKER(hq,SSE); +DIR_MOD_MARKER(hq,S); +DIR_MOD_MARKER(hq,SSW); +DIR_MOD_MARKER(hq,SW); +DIR_MOD_MARKER(hq,WSW); +DIR_MOD_MARKER(hq,W); +DIR_MOD_MARKER(hq,WNW); +DIR_MOD_MARKER(hq,NW); +DIR_MOD_MARKER(hq,NNW); + diff --git a/addons/markers/CfgMarkers/CfgMarkersIconsModifier.hpp b/addons/markers/CfgMarkers/CfgMarkersIconsModifier.hpp new file mode 100644 index 0000000..d9b38ae --- /dev/null +++ b/addons/markers/CfgMarkers/CfgMarkersIconsModifier.hpp @@ -0,0 +1,83 @@ +// Icons +MARKER(mod,armor); +MARKER(mod,infantry); +MARKER(mod,motorized); +MARKER(mod,reconnaissance); +MARKER(mod,signal_unit); +MARKER(mod,anti_armor); +MARKER(mod,rotary_wing); +MARKER(mod,uav); +MARKER(mod,artillery); +MARKER(mod,artillery_sp); +MARKER(mod,mortar); +MARKER(mod,mortar_armored); +MARKER(mod,air_defence); +MARKER(mod,missile); +MARKER(mod,surface_surface); +MARKER(mod,engineer); +MARKER(mod,engineer_armored); +MARKER(mod,maintenance); +MARKER(mod,supply); +MARKER(mod,transportation); +MARKER(mod,cbrn); +MARKER(mod,combat_service_support); +MARKER(mod,fixed_wing); +MARKER(mod,medical); +MARKER(mod,military_police); +MARKER(mod,military_intelligence); +MARKER(mod,amphibious); +MARKER(mod,joint_fire_support); +MARKER(mod,naval); +MARKER(mod,special_forces); +MARKER(mod,special_operation_forces); +MARKER(mod,combined_arms); +MARKER(mod,radar); +MARKER(mod,field_artillery_observer); +MARKER(mod,eod); +MARKER(mod,ranger); +MARKER(mod,aviation_composite); +MARKER(mod,electromagnetic_warfare); +MARKER(mod,internal_security_force); +MARKER(mod,isaf); +MARKER(mod,liaison); +MARKER(mod,main_gun_system); +MARKER(mod,police); +MARKER(mod,search_and_rescue); + +// Modifier 1 (top) +MARKER(mod,attack); +MARKER(mod,air_assault); +MARKER(mod,maintenance_top); +MARKER(mod,multiple_rocket_launcher); +MARKER(mod,single_rocket_launcher); +MARKER(mod,sniper); +MARKER(mod,headquarters); +MARKER(mod,naval_top); +MARKER(mod,radar_top); +MARKER(mod,bridging); +MARKER(mod,medevac); +MARKER(mod,eod_top); + +// Modifier 2 (bottom) +MARKER(mod,airborne); +MARKER(mod,mountain); +MARKER(mod,light); +MARKER(mod,medium); +MARKER(mod,heavy); +MARKER(mod,vstol); +MARKER(mod,wheeled); +MARKER(mod,towed); + +// Sizes/Echelons +MARKER(size,1); +MARKER(size,2); +MARKER(size,3); +MARKER(size,4); +MARKER(size,5); +MARKER(size,6); +MARKER(size,7); +MARKER(size,8); +MARKER(size,9); +MARKER(size,10); +MARKER(size,11); +MARKER(size,12); diff --git a/addons/markers/CfgMarkers/CfgMarkersNeutral.hpp b/addons/markers/CfgMarkers/CfgMarkersNeutral.hpp deleted file mode 100644 index 104c2e7..0000000 --- a/addons/markers/CfgMarkers/CfgMarkersNeutral.hpp +++ /dev/null @@ -1,86 +0,0 @@ -//Neutral Icon -MARKER(neu,mod,armor); -MARKER(neu,mod,infantry); -MARKER(neu,mod,motorized); -MARKER(neu,mod,reconnaissance); -MARKER(neu,mod,signal_unit); -MARKER(neu,mod,anti_armor); -MARKER(neu,mod,rotary_wing); -MARKER(neu,mod,uav); -MARKER(neu,mod,artillery); -MARKER(neu,mod,artillery_sp); -MARKER(neu,mod,mortar); -MARKER(neu,mod,mortar_armored); -MARKER(neu,mod,air_defence); -MARKER(neu,mod,missile); -MARKER(neu,mod,surface_surface); -MARKER(neu,mod,engineer); -MARKER(neu,mod,engineer_armored); -MARKER(neu,mod,maintenance); -MARKER(neu,mod,supply); -MARKER(neu,mod,transportation); -MARKER(neu,mod,cbrn); -MARKER(neu,mod,combat_service_support); -MARKER(neu,mod,fixed_wing); -MARKER(neu,mod,medical); -MARKER(neu,mod,military_police); -MARKER(neu,mod,military_intelligence); -MARKER(neu,mod,amphibious); -MARKER(neu,mod,joint_fire_support); -MARKER(neu,mod,naval); -MARKER(neu,mod,special_forces); -MARKER(neu,mod,special_operation_forces); -MARKER(neu,mod,combined_arms); -MARKER(neu,mod,radar); -MARKER(neu,mod,field_artillery_observer); -MARKER(neu,mod,eod); -MARKER(neu,mod,ranger); -MARKER(neu,mod,aviation_composite); -MARKER(neu,mod,electromagnetic_warfare); -MARKER(neu,mod,internal_security_force); -MARKER(neu,mod,isaf); -MARKER(neu,mod,liaison); -MARKER(neu,mod,main_gun_system); -MARKER(neu,mod,police); -MARKER(neu,mod,search_and_rescue); - -//Neutral Mod1 -MARKER(neu,mod,attack); -MARKER(neu,mod,air_assault); -MARKER(neu,mod,maintenance_top); -MARKER(neu,mod,multiple_rocket_launcher); -MARKER(neu,mod,single_rocket_launcher); -MARKER(neu,mod,sniper); -MARKER(neu,mod,headquarters); -MARKER(neu,mod,naval_top); -MARKER(neu,mod,radar_top); -MARKER(neu,mod,bridging); -MARKER(neu,mod,medevac); -MARKER(neu,mod,eod_top); - -//Neutral Mod2 -MARKER(neu,mod,airborne); -MARKER(neu,mod,mountain); -MARKER(neu,mod,light); -MARKER(neu,mod,medium); -MARKER(neu,mod,heavy); -MARKER(neu,mod,vstol); -MARKER(neu,mod,wheeled); -MARKER(neu,mod,towed); - -//Neutral Sizes -MARKER(neu,size,1); -MARKER(neu,size,2); -MARKER(neu,size,3); -MARKER(neu,size,4); -MARKER(neu,size,5); -MARKER(neu,size,6); -MARKER(neu,size,7); -MARKER(neu,size,8); -MARKER(neu,size,9); -MARKER(neu,size,10); -MARKER(neu,size,11); -MARKER(neu,size,12); - -//Neutral Direction of Movement -#include "CfgMarkersNeutralDir.hpp" diff --git a/addons/markers/CfgMarkers/CfgMarkersNeutralDir.hpp b/addons/markers/CfgMarkers/CfgMarkersNeutralDir.hpp deleted file mode 100644 index 6eb8077..0000000 --- a/addons/markers/CfgMarkers/CfgMarkersNeutralDir.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// ------------------------------------------------ -// Character markers for Direction of Movement -// This file is generated and should not be edited! -// ------------------------------------------------ - -DIRMARKER(neu,N); -DIRMARKER(neu,NNE); -DIRMARKER(neu,NE); -DIRMARKER(neu,ENE); -DIRMARKER(neu,E); -DIRMARKER(neu,ESE); -DIRMARKER(neu,SE); -DIRMARKER(neu,SSE); -DIRMARKER(neu,S); -DIRMARKER(neu,SSW); -DIRMARKER(neu,SW); -DIRMARKER(neu,WSW); -DIRMARKER(neu,W); -DIRMARKER(neu,WNW); -DIRMARKER(neu,NW); -DIRMARKER(neu,NNW); - -ALTDIRMARKER(neu,hq,N); -ALTDIRMARKER(neu,hq,NNE); -ALTDIRMARKER(neu,hq,NE); -ALTDIRMARKER(neu,hq,ENE); -ALTDIRMARKER(neu,hq,E); -ALTDIRMARKER(neu,hq,ESE); -ALTDIRMARKER(neu,hq,SE); -ALTDIRMARKER(neu,hq,SSE); -ALTDIRMARKER(neu,hq,S); -ALTDIRMARKER(neu,hq,SSW); -ALTDIRMARKER(neu,hq,SW); -ALTDIRMARKER(neu,hq,WSW); -ALTDIRMARKER(neu,hq,W); -ALTDIRMARKER(neu,hq,WNW); -ALTDIRMARKER(neu,hq,NW); -ALTDIRMARKER(neu,hq,NNW); - diff --git a/addons/markers/CfgMarkers/CfgMarkersRedfor.hpp b/addons/markers/CfgMarkers/CfgMarkersRedfor.hpp deleted file mode 100644 index 923f960..0000000 --- a/addons/markers/CfgMarkers/CfgMarkersRedfor.hpp +++ /dev/null @@ -1,86 +0,0 @@ -//Redfor Icon -MARKER(red,mod,armor); -MARKER(red,mod,infantry); -MARKER(red,mod,motorized); -MARKER(red,mod,reconnaissance); -MARKER(red,mod,signal_unit); -MARKER(red,mod,anti_armor); -MARKER(red,mod,rotary_wing); -MARKER(red,mod,uav); -MARKER(red,mod,artillery); -MARKER(red,mod,artillery_sp); -MARKER(red,mod,mortar); -MARKER(red,mod,mortar_armored); -MARKER(red,mod,air_defence); -MARKER(red,mod,missile); -MARKER(red,mod,surface_surface); -MARKER(red,mod,engineer); -MARKER(red,mod,engineer_armored); -MARKER(red,mod,maintenance); -MARKER(red,mod,supply); -MARKER(red,mod,transportation); -MARKER(red,mod,cbrn); -MARKER(red,mod,combat_service_support); -MARKER(red,mod,fixed_wing); -MARKER(red,mod,medical); -MARKER(red,mod,military_police); -MARKER(red,mod,military_intelligence); -MARKER(red,mod,amphibious); -MARKER(red,mod,joint_fire_support); -MARKER(red,mod,naval); -MARKER(red,mod,special_forces); -MARKER(red,mod,special_operation_forces); -MARKER(red,mod,combined_arms); -MARKER(red,mod,radar); -MARKER(red,mod,field_artillery_observer); -MARKER(red,mod,eod); -MARKER(red,mod,ranger); -MARKER(red,mod,aviation_composite); -MARKER(red,mod,electromagnetic_warfare); -MARKER(red,mod,internal_security_force); -MARKER(red,mod,isaf); -MARKER(red,mod,liaison); -MARKER(red,mod,main_gun_system); -MARKER(red,mod,police); -MARKER(red,mod,search_and_rescue); - -//Redfor Mod1 -MARKER(red,mod,attack); -MARKER(red,mod,air_assault); -MARKER(red,mod,maintenance_top); -MARKER(red,mod,multiple_rocket_launcher); -MARKER(red,mod,single_rocket_launcher); -MARKER(red,mod,sniper); -MARKER(red,mod,headquarters); -MARKER(red,mod,naval_top); -MARKER(red,mod,radar_top); -MARKER(red,mod,bridging); -MARKER(red,mod,medevac); -MARKER(red,mod,eod_top); - -//Redfor Mod2 -MARKER(red,mod,airborne); -MARKER(red,mod,mountain); -MARKER(red,mod,light); -MARKER(red,mod,medium); -MARKER(red,mod,heavy); -MARKER(red,mod,vstol); -MARKER(red,mod,wheeled); -MARKER(red,mod,towed); - -//Redfor Sizes -MARKER(red,size,1); -MARKER(red,size,2); -MARKER(red,size,3); -MARKER(red,size,4); -MARKER(red,size,5); -MARKER(red,size,6); -MARKER(red,size,7); -MARKER(red,size,8); -MARKER(red,size,9); -MARKER(red,size,10); -MARKER(red,size,11); -MARKER(red,size,12); - -//Redfor Direction of Movement -#include "CfgMarkersRedforDir.hpp" diff --git a/addons/markers/CfgMarkers/CfgMarkersRedforDir.hpp b/addons/markers/CfgMarkers/CfgMarkersRedforDir.hpp deleted file mode 100644 index d740fdd..0000000 --- a/addons/markers/CfgMarkers/CfgMarkersRedforDir.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// ------------------------------------------------ -// Character markers for Direction of Movement -// This file is generated and should not be edited! -// ------------------------------------------------ - -DIRMARKER(red,N); -DIRMARKER(red,NNE); -DIRMARKER(red,NE); -DIRMARKER(red,ENE); -DIRMARKER(red,E); -DIRMARKER(red,ESE); -DIRMARKER(red,SE); -DIRMARKER(red,SSE); -DIRMARKER(red,S); -DIRMARKER(red,SSW); -DIRMARKER(red,SW); -DIRMARKER(red,WSW); -DIRMARKER(red,W); -DIRMARKER(red,WNW); -DIRMARKER(red,NW); -DIRMARKER(red,NNW); - -ALTDIRMARKER(red,hq,N); -ALTDIRMARKER(red,hq,NNE); -ALTDIRMARKER(red,hq,NE); -ALTDIRMARKER(red,hq,ENE); -ALTDIRMARKER(red,hq,E); -ALTDIRMARKER(red,hq,ESE); -ALTDIRMARKER(red,hq,SE); -ALTDIRMARKER(red,hq,SSE); -ALTDIRMARKER(red,hq,S); -ALTDIRMARKER(red,hq,SSW); -ALTDIRMARKER(red,hq,SW); -ALTDIRMARKER(red,hq,WSW); -ALTDIRMARKER(red,hq,W); -ALTDIRMARKER(red,hq,WNW); -ALTDIRMARKER(red,hq,NW); -ALTDIRMARKER(red,hq,NNW); - diff --git a/addons/markers/CfgMarkers/CfgMarkersSpecialCharsLB.hpp b/addons/markers/CfgMarkers/CfgMarkersSpecialCharsLB.hpp index 21bb35f..146a77f 100644 --- a/addons/markers/CfgMarkers/CfgMarkersSpecialCharsLB.hpp +++ b/addons/markers/CfgMarkers/CfgMarkersSpecialCharsLB.hpp @@ -1,135 +1,137 @@ +// ------------------------------------------------ // Character markers for anchor lb -// This file is generated and should not be edited +// 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); +SPECIAL_CHAR_MARKER(lb,0,hash); +SPECIAL_CHAR_MARKER(lb,0,slash); +SPECIAL_CHAR_MARKER(lb,0,backslash); +SPECIAL_CHAR_MARKER(lb,0,dot); +SPECIAL_CHAR_MARKER(lb,0,plus); +SPECIAL_CHAR_MARKER(lb,0,minus); +SPECIAL_CHAR_MARKER(lb,0,space); +SPECIAL_CHAR_MARKER(lb,0,parenthesesleft); +SPECIAL_CHAR_MARKER(lb,0,parenthesesright); +SPECIAL_CHAR_MARKER(lb,0,bracketsleft); +SPECIAL_CHAR_MARKER(lb,0,bracketsright); +SPECIAL_CHAR_MARKER(lb,0,bracesleft); +SPECIAL_CHAR_MARKER(lb,0,bracesright); +SPECIAL_CHAR_MARKER(lb,0,equal); +SPECIAL_CHAR_MARKER(lb,0,tilde); +SPECIAL_CHAR_MARKER(lb,0,colon); +SPECIAL_CHAR_MARKER(lb,0,comma); +SPECIAL_CHAR_MARKER(lb,0,pipe); +SPECIAL_CHAR_MARKER(lb,0,asterisk); +SPECIAL_CHAR_MARKER(lb,0,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(lb,1,hash); +SPECIAL_CHAR_MARKER(lb,1,slash); +SPECIAL_CHAR_MARKER(lb,1,backslash); +SPECIAL_CHAR_MARKER(lb,1,dot); +SPECIAL_CHAR_MARKER(lb,1,plus); +SPECIAL_CHAR_MARKER(lb,1,minus); +SPECIAL_CHAR_MARKER(lb,1,space); +SPECIAL_CHAR_MARKER(lb,1,parenthesesleft); +SPECIAL_CHAR_MARKER(lb,1,parenthesesright); +SPECIAL_CHAR_MARKER(lb,1,bracketsleft); +SPECIAL_CHAR_MARKER(lb,1,bracketsright); +SPECIAL_CHAR_MARKER(lb,1,bracesleft); +SPECIAL_CHAR_MARKER(lb,1,bracesright); +SPECIAL_CHAR_MARKER(lb,1,equal); +SPECIAL_CHAR_MARKER(lb,1,tilde); +SPECIAL_CHAR_MARKER(lb,1,colon); +SPECIAL_CHAR_MARKER(lb,1,comma); +SPECIAL_CHAR_MARKER(lb,1,pipe); +SPECIAL_CHAR_MARKER(lb,1,asterisk); +SPECIAL_CHAR_MARKER(lb,1,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(lb,2,hash); +SPECIAL_CHAR_MARKER(lb,2,slash); +SPECIAL_CHAR_MARKER(lb,2,backslash); +SPECIAL_CHAR_MARKER(lb,2,dot); +SPECIAL_CHAR_MARKER(lb,2,plus); +SPECIAL_CHAR_MARKER(lb,2,minus); +SPECIAL_CHAR_MARKER(lb,2,space); +SPECIAL_CHAR_MARKER(lb,2,parenthesesleft); +SPECIAL_CHAR_MARKER(lb,2,parenthesesright); +SPECIAL_CHAR_MARKER(lb,2,bracketsleft); +SPECIAL_CHAR_MARKER(lb,2,bracketsright); +SPECIAL_CHAR_MARKER(lb,2,bracesleft); +SPECIAL_CHAR_MARKER(lb,2,bracesright); +SPECIAL_CHAR_MARKER(lb,2,equal); +SPECIAL_CHAR_MARKER(lb,2,tilde); +SPECIAL_CHAR_MARKER(lb,2,colon); +SPECIAL_CHAR_MARKER(lb,2,comma); +SPECIAL_CHAR_MARKER(lb,2,pipe); +SPECIAL_CHAR_MARKER(lb,2,asterisk); +SPECIAL_CHAR_MARKER(lb,2,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(lb,3,hash); +SPECIAL_CHAR_MARKER(lb,3,slash); +SPECIAL_CHAR_MARKER(lb,3,backslash); +SPECIAL_CHAR_MARKER(lb,3,dot); +SPECIAL_CHAR_MARKER(lb,3,plus); +SPECIAL_CHAR_MARKER(lb,3,minus); +SPECIAL_CHAR_MARKER(lb,3,space); +SPECIAL_CHAR_MARKER(lb,3,parenthesesleft); +SPECIAL_CHAR_MARKER(lb,3,parenthesesright); +SPECIAL_CHAR_MARKER(lb,3,bracketsleft); +SPECIAL_CHAR_MARKER(lb,3,bracketsright); +SPECIAL_CHAR_MARKER(lb,3,bracesleft); +SPECIAL_CHAR_MARKER(lb,3,bracesright); +SPECIAL_CHAR_MARKER(lb,3,equal); +SPECIAL_CHAR_MARKER(lb,3,tilde); +SPECIAL_CHAR_MARKER(lb,3,colon); +SPECIAL_CHAR_MARKER(lb,3,comma); +SPECIAL_CHAR_MARKER(lb,3,pipe); +SPECIAL_CHAR_MARKER(lb,3,asterisk); +SPECIAL_CHAR_MARKER(lb,3,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(lb,4,hash); +SPECIAL_CHAR_MARKER(lb,4,slash); +SPECIAL_CHAR_MARKER(lb,4,backslash); +SPECIAL_CHAR_MARKER(lb,4,dot); +SPECIAL_CHAR_MARKER(lb,4,plus); +SPECIAL_CHAR_MARKER(lb,4,minus); +SPECIAL_CHAR_MARKER(lb,4,space); +SPECIAL_CHAR_MARKER(lb,4,parenthesesleft); +SPECIAL_CHAR_MARKER(lb,4,parenthesesright); +SPECIAL_CHAR_MARKER(lb,4,bracketsleft); +SPECIAL_CHAR_MARKER(lb,4,bracketsright); +SPECIAL_CHAR_MARKER(lb,4,bracesleft); +SPECIAL_CHAR_MARKER(lb,4,bracesright); +SPECIAL_CHAR_MARKER(lb,4,equal); +SPECIAL_CHAR_MARKER(lb,4,tilde); +SPECIAL_CHAR_MARKER(lb,4,colon); +SPECIAL_CHAR_MARKER(lb,4,comma); +SPECIAL_CHAR_MARKER(lb,4,pipe); +SPECIAL_CHAR_MARKER(lb,4,asterisk); +SPECIAL_CHAR_MARKER(lb,4,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(lb,5,hash); +SPECIAL_CHAR_MARKER(lb,5,slash); +SPECIAL_CHAR_MARKER(lb,5,backslash); +SPECIAL_CHAR_MARKER(lb,5,dot); +SPECIAL_CHAR_MARKER(lb,5,plus); +SPECIAL_CHAR_MARKER(lb,5,minus); +SPECIAL_CHAR_MARKER(lb,5,space); +SPECIAL_CHAR_MARKER(lb,5,parenthesesleft); +SPECIAL_CHAR_MARKER(lb,5,parenthesesright); +SPECIAL_CHAR_MARKER(lb,5,bracketsleft); +SPECIAL_CHAR_MARKER(lb,5,bracketsright); +SPECIAL_CHAR_MARKER(lb,5,bracesleft); +SPECIAL_CHAR_MARKER(lb,5,bracesright); +SPECIAL_CHAR_MARKER(lb,5,equal); +SPECIAL_CHAR_MARKER(lb,5,tilde); +SPECIAL_CHAR_MARKER(lb,5,colon); +SPECIAL_CHAR_MARKER(lb,5,comma); +SPECIAL_CHAR_MARKER(lb,5,pipe); +SPECIAL_CHAR_MARKER(lb,5,asterisk); +SPECIAL_CHAR_MARKER(lb,5,circumflex); +SPECIAL_CHAR_MARKER(lb,5,underscore); diff --git a/addons/markers/CfgMarkers/CfgMarkersSpecialCharsRB.hpp b/addons/markers/CfgMarkers/CfgMarkersSpecialCharsRB.hpp index e6e7e34..440af4f 100644 --- a/addons/markers/CfgMarkers/CfgMarkersSpecialCharsRB.hpp +++ b/addons/markers/CfgMarkers/CfgMarkersSpecialCharsRB.hpp @@ -1,135 +1,137 @@ +// ------------------------------------------------ // Character markers for anchor rb -// This file is generated and should not be edited +// 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); +SPECIAL_CHAR_MARKER(rb,0,hash); +SPECIAL_CHAR_MARKER(rb,0,slash); +SPECIAL_CHAR_MARKER(rb,0,backslash); +SPECIAL_CHAR_MARKER(rb,0,dot); +SPECIAL_CHAR_MARKER(rb,0,plus); +SPECIAL_CHAR_MARKER(rb,0,minus); +SPECIAL_CHAR_MARKER(rb,0,space); +SPECIAL_CHAR_MARKER(rb,0,parenthesesleft); +SPECIAL_CHAR_MARKER(rb,0,parenthesesright); +SPECIAL_CHAR_MARKER(rb,0,bracketsleft); +SPECIAL_CHAR_MARKER(rb,0,bracketsright); +SPECIAL_CHAR_MARKER(rb,0,bracesleft); +SPECIAL_CHAR_MARKER(rb,0,bracesright); +SPECIAL_CHAR_MARKER(rb,0,equal); +SPECIAL_CHAR_MARKER(rb,0,tilde); +SPECIAL_CHAR_MARKER(rb,0,colon); +SPECIAL_CHAR_MARKER(rb,0,comma); +SPECIAL_CHAR_MARKER(rb,0,pipe); +SPECIAL_CHAR_MARKER(rb,0,asterisk); +SPECIAL_CHAR_MARKER(rb,0,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(rb,1,hash); +SPECIAL_CHAR_MARKER(rb,1,slash); +SPECIAL_CHAR_MARKER(rb,1,backslash); +SPECIAL_CHAR_MARKER(rb,1,dot); +SPECIAL_CHAR_MARKER(rb,1,plus); +SPECIAL_CHAR_MARKER(rb,1,minus); +SPECIAL_CHAR_MARKER(rb,1,space); +SPECIAL_CHAR_MARKER(rb,1,parenthesesleft); +SPECIAL_CHAR_MARKER(rb,1,parenthesesright); +SPECIAL_CHAR_MARKER(rb,1,bracketsleft); +SPECIAL_CHAR_MARKER(rb,1,bracketsright); +SPECIAL_CHAR_MARKER(rb,1,bracesleft); +SPECIAL_CHAR_MARKER(rb,1,bracesright); +SPECIAL_CHAR_MARKER(rb,1,equal); +SPECIAL_CHAR_MARKER(rb,1,tilde); +SPECIAL_CHAR_MARKER(rb,1,colon); +SPECIAL_CHAR_MARKER(rb,1,comma); +SPECIAL_CHAR_MARKER(rb,1,pipe); +SPECIAL_CHAR_MARKER(rb,1,asterisk); +SPECIAL_CHAR_MARKER(rb,1,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(rb,2,hash); +SPECIAL_CHAR_MARKER(rb,2,slash); +SPECIAL_CHAR_MARKER(rb,2,backslash); +SPECIAL_CHAR_MARKER(rb,2,dot); +SPECIAL_CHAR_MARKER(rb,2,plus); +SPECIAL_CHAR_MARKER(rb,2,minus); +SPECIAL_CHAR_MARKER(rb,2,space); +SPECIAL_CHAR_MARKER(rb,2,parenthesesleft); +SPECIAL_CHAR_MARKER(rb,2,parenthesesright); +SPECIAL_CHAR_MARKER(rb,2,bracketsleft); +SPECIAL_CHAR_MARKER(rb,2,bracketsright); +SPECIAL_CHAR_MARKER(rb,2,bracesleft); +SPECIAL_CHAR_MARKER(rb,2,bracesright); +SPECIAL_CHAR_MARKER(rb,2,equal); +SPECIAL_CHAR_MARKER(rb,2,tilde); +SPECIAL_CHAR_MARKER(rb,2,colon); +SPECIAL_CHAR_MARKER(rb,2,comma); +SPECIAL_CHAR_MARKER(rb,2,pipe); +SPECIAL_CHAR_MARKER(rb,2,asterisk); +SPECIAL_CHAR_MARKER(rb,2,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(rb,3,hash); +SPECIAL_CHAR_MARKER(rb,3,slash); +SPECIAL_CHAR_MARKER(rb,3,backslash); +SPECIAL_CHAR_MARKER(rb,3,dot); +SPECIAL_CHAR_MARKER(rb,3,plus); +SPECIAL_CHAR_MARKER(rb,3,minus); +SPECIAL_CHAR_MARKER(rb,3,space); +SPECIAL_CHAR_MARKER(rb,3,parenthesesleft); +SPECIAL_CHAR_MARKER(rb,3,parenthesesright); +SPECIAL_CHAR_MARKER(rb,3,bracketsleft); +SPECIAL_CHAR_MARKER(rb,3,bracketsright); +SPECIAL_CHAR_MARKER(rb,3,bracesleft); +SPECIAL_CHAR_MARKER(rb,3,bracesright); +SPECIAL_CHAR_MARKER(rb,3,equal); +SPECIAL_CHAR_MARKER(rb,3,tilde); +SPECIAL_CHAR_MARKER(rb,3,colon); +SPECIAL_CHAR_MARKER(rb,3,comma); +SPECIAL_CHAR_MARKER(rb,3,pipe); +SPECIAL_CHAR_MARKER(rb,3,asterisk); +SPECIAL_CHAR_MARKER(rb,3,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(rb,4,hash); +SPECIAL_CHAR_MARKER(rb,4,slash); +SPECIAL_CHAR_MARKER(rb,4,backslash); +SPECIAL_CHAR_MARKER(rb,4,dot); +SPECIAL_CHAR_MARKER(rb,4,plus); +SPECIAL_CHAR_MARKER(rb,4,minus); +SPECIAL_CHAR_MARKER(rb,4,space); +SPECIAL_CHAR_MARKER(rb,4,parenthesesleft); +SPECIAL_CHAR_MARKER(rb,4,parenthesesright); +SPECIAL_CHAR_MARKER(rb,4,bracketsleft); +SPECIAL_CHAR_MARKER(rb,4,bracketsright); +SPECIAL_CHAR_MARKER(rb,4,bracesleft); +SPECIAL_CHAR_MARKER(rb,4,bracesright); +SPECIAL_CHAR_MARKER(rb,4,equal); +SPECIAL_CHAR_MARKER(rb,4,tilde); +SPECIAL_CHAR_MARKER(rb,4,colon); +SPECIAL_CHAR_MARKER(rb,4,comma); +SPECIAL_CHAR_MARKER(rb,4,pipe); +SPECIAL_CHAR_MARKER(rb,4,asterisk); +SPECIAL_CHAR_MARKER(rb,4,circumflex); +SPECIAL_CHAR_MARKER(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); +SPECIAL_CHAR_MARKER(rb,5,hash); +SPECIAL_CHAR_MARKER(rb,5,slash); +SPECIAL_CHAR_MARKER(rb,5,backslash); +SPECIAL_CHAR_MARKER(rb,5,dot); +SPECIAL_CHAR_MARKER(rb,5,plus); +SPECIAL_CHAR_MARKER(rb,5,minus); +SPECIAL_CHAR_MARKER(rb,5,space); +SPECIAL_CHAR_MARKER(rb,5,parenthesesleft); +SPECIAL_CHAR_MARKER(rb,5,parenthesesright); +SPECIAL_CHAR_MARKER(rb,5,bracketsleft); +SPECIAL_CHAR_MARKER(rb,5,bracketsright); +SPECIAL_CHAR_MARKER(rb,5,bracesleft); +SPECIAL_CHAR_MARKER(rb,5,bracesright); +SPECIAL_CHAR_MARKER(rb,5,equal); +SPECIAL_CHAR_MARKER(rb,5,tilde); +SPECIAL_CHAR_MARKER(rb,5,colon); +SPECIAL_CHAR_MARKER(rb,5,comma); +SPECIAL_CHAR_MARKER(rb,5,pipe); +SPECIAL_CHAR_MARKER(rb,5,asterisk); +SPECIAL_CHAR_MARKER(rb,5,circumflex); +SPECIAL_CHAR_MARKER(rb,5,underscore); diff --git a/addons/markers/CfgMarkers/CfgMarkersUnknown.hpp b/addons/markers/CfgMarkers/CfgMarkersUnknown.hpp deleted file mode 100644 index 13c7ea5..0000000 --- a/addons/markers/CfgMarkers/CfgMarkersUnknown.hpp +++ /dev/null @@ -1,86 +0,0 @@ -//Unknown Icon -MARKER(unk,mod,armor); -MARKER(unk,mod,infantry); -MARKER(unk,mod,motorized); -MARKER(unk,mod,reconnaissance); -MARKER(unk,mod,signal_unit); -MARKER(unk,mod,anti_armor); -MARKER(unk,mod,rotary_wing); -MARKER(unk,mod,uav); -MARKER(unk,mod,artillery); -MARKER(unk,mod,artillery_sp); -MARKER(unk,mod,mortar); -MARKER(unk,mod,mortar_armored); -MARKER(unk,mod,air_defence); -MARKER(unk,mod,missile); -MARKER(unk,mod,surface_surface); -MARKER(unk,mod,engineer); -MARKER(unk,mod,engineer_armored); -MARKER(unk,mod,maintenance); -MARKER(unk,mod,supply); -MARKER(unk,mod,transportation); -MARKER(unk,mod,cbrn); -MARKER(unk,mod,combat_service_support); -MARKER(unk,mod,fixed_wing); -MARKER(unk,mod,medical); -MARKER(unk,mod,military_police); -MARKER(unk,mod,military_intelligence); -MARKER(unk,mod,amphibious); -MARKER(unk,mod,joint_fire_support); -MARKER(unk,mod,naval); -MARKER(unk,mod,special_forces); -MARKER(unk,mod,special_operation_forces); -MARKER(unk,mod,combined_arms); -MARKER(unk,mod,radar); -MARKER(unk,mod,field_artillery_observer); -MARKER(unk,mod,eod); -MARKER(unk,mod,ranger); -MARKER(unk,mod,aviation_composite); -MARKER(unk,mod,electromagnetic_warfare); -MARKER(unk,mod,internal_security_force); -MARKER(unk,mod,isaf); -MARKER(unk,mod,liaison); -MARKER(unk,mod,main_gun_system); -MARKER(unk,mod,police); -MARKER(unk,mod,search_and_rescue); - -//Unknown Mod1 -MARKER(unk,mod,attack); -MARKER(unk,mod,air_assault); -MARKER(unk,mod,maintenance_top); -MARKER(unk,mod,multiple_rocket_launcher); -MARKER(unk,mod,single_rocket_launcher); -MARKER(unk,mod,sniper); -MARKER(unk,mod,headquarters); -MARKER(unk,mod,naval_top); -MARKER(unk,mod,radar_top); -MARKER(unk,mod,bridging); -MARKER(unk,mod,medevac); -MARKER(unk,mod,eod_top); - -//Unknown Mod2 -MARKER(unk,mod,airborne); -MARKER(unk,mod,mountain); -MARKER(unk,mod,light); -MARKER(unk,mod,medium); -MARKER(unk,mod,heavy); -MARKER(unk,mod,vstol); -MARKER(unk,mod,wheeled); -MARKER(unk,mod,towed); - -//Unknown Sizes -MARKER(unk,size,1); -MARKER(unk,size,2); -MARKER(unk,size,3); -MARKER(unk,size,4); -MARKER(unk,size,5); -MARKER(unk,size,6); -MARKER(unk,size,7); -MARKER(unk,size,8); -MARKER(unk,size,9); -MARKER(unk,size,10); -MARKER(unk,size,11); -MARKER(unk,size,12); - -//Unknown Direction of Movement -#include "CfgMarkersUnknownDir.hpp" diff --git a/addons/markers/CfgMarkers/CfgMarkersUnknownDir.hpp b/addons/markers/CfgMarkers/CfgMarkersUnknownDir.hpp deleted file mode 100644 index 23757d6..0000000 --- a/addons/markers/CfgMarkers/CfgMarkersUnknownDir.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// ------------------------------------------------ -// Character markers for Direction of Movement -// This file is generated and should not be edited! -// ------------------------------------------------ - -DIRMARKER(unk,N); -DIRMARKER(unk,NNE); -DIRMARKER(unk,NE); -DIRMARKER(unk,ENE); -DIRMARKER(unk,E); -DIRMARKER(unk,ESE); -DIRMARKER(unk,SE); -DIRMARKER(unk,SSE); -DIRMARKER(unk,S); -DIRMARKER(unk,SSW); -DIRMARKER(unk,SW); -DIRMARKER(unk,WSW); -DIRMARKER(unk,W); -DIRMARKER(unk,WNW); -DIRMARKER(unk,NW); -DIRMARKER(unk,NNW); - -ALTDIRMARKER(unk,hq,N); -ALTDIRMARKER(unk,hq,NNE); -ALTDIRMARKER(unk,hq,NE); -ALTDIRMARKER(unk,hq,ENE); -ALTDIRMARKER(unk,hq,E); -ALTDIRMARKER(unk,hq,ESE); -ALTDIRMARKER(unk,hq,SE); -ALTDIRMARKER(unk,hq,SSE); -ALTDIRMARKER(unk,hq,S); -ALTDIRMARKER(unk,hq,SSW); -ALTDIRMARKER(unk,hq,SW); -ALTDIRMARKER(unk,hq,WSW); -ALTDIRMARKER(unk,hq,W); -ALTDIRMARKER(unk,hq,WNW); -ALTDIRMARKER(unk,hq,NW); -ALTDIRMARKER(unk,hq,NNW); - diff --git a/tools/markers/create_alphanumeric_markers.py b/tools/markers/create_alphanumeric_markers.py index a439b98..66e1bd2 100644 --- a/tools/markers/create_alphanumeric_markers.py +++ b/tools/markers/create_alphanumeric_markers.py @@ -45,10 +45,10 @@ } def get_alphanum_macro(anchor, pos, letter): - return f'ALPHANUMMARKER({anchor},{pos},{letter});' + return f'ALPHANUM_MARKER({anchor},{pos},{letter});' def get_special_macro(anchor, pos, letter): - return f'SPECIALCHARMARKER({anchor},{pos},{letter});' + return f'SPECIAL_CHAR_MARKER({anchor},{pos},{letter});' printable_char_sets = { 'alphanum': { diff --git a/tools/markers/create_direction_markers.py b/tools/markers/create_direction_markers.py index 2a1fcef..60b13df 100644 --- a/tools/markers/create_direction_markers.py +++ b/tools/markers/create_direction_markers.py @@ -75,11 +75,11 @@ 'unk': 'Unknown', } -def get_dir_macro(identity, direction): - return f'DIRMARKER({identity},{direction});' +def get_dir_macro(direction): + return f'DIR_MARKER({direction});' -def get_alternative_dir_macro(identity, mod, direction): - return f'ALTDIRMARKER({identity},{mod},{direction});' +def get_alternative_dir_macro(mod, direction): + return f'DIR_MOD_MARKER({mod},{direction});' class Point(NamedTuple): x: float @@ -227,28 +227,26 @@ def create_all_images(offsets: dict[str, dict[str, dict[str]]]): return images, icons -def write_include_files(output_dir: pathlib.Path, offsets: dict[str, dict[str, dict[str]]]): +def write_include_files(output_dir: pathlib.Path, mods: list[str]): """Writes all marker into a include files. Args: path (Path): Path to the directory where the include files should be saved. - offsets (dict[str, dict[str, dict[str]]]): Markers to create. + mods (list[str]): Default, HQ, ... modifications. """ + with open(output_dir / f'CfgMarkersDirections.hpp', 'w') as f: + comment = util.get_generated_comment_lines('Character markers for Direction of Movement') + f.writelines(comment) - for identity, identity_config in offsets.items(): - with open(output_dir / f'CfgMarkers{identities[identity]}Dir.hpp', 'w') as f: - comment = util.get_generated_comment_lines('Character markers for Direction of Movement') - f.writelines(comment) - - for mod in identity_config: - for direction in directions: - if mod == 'default': - macro = get_dir_macro(identity, direction) - else: - macro = get_alternative_dir_macro(identity, mod, direction) - f.write(macro + '\n') + for mod in mods: + for direction in directions: + if mod == 'default': + macro = get_dir_macro(direction) + else: + macro = get_alternative_dir_macro(mod, direction) + f.write(macro + '\n') - f.write('\n') + f.write('\n') def debug_create_marker(direction: str, identity: str = 'blu', hq: bool = False): @@ -298,7 +296,7 @@ def main(args: argparse.Namespace): print(f'Exported {len(all_images)} images.\n') print('Creating include file...') - write_include_files(args.output_dir, offsets) + write_include_files(args.output_dir, offsets['blu'].keys()) print('Finished generating character marker files.') d,h,m,s = util.fract_sec(timeit.default_timer() - start_time) diff --git a/tools/markers/create_dtg_markers.py b/tools/markers/create_dtg_markers.py index 617c1f9..1d3b780 100644 --- a/tools/markers/create_dtg_markers.py +++ b/tools/markers/create_dtg_markers.py @@ -47,7 +47,7 @@ formats = [long_format_alphabets, short_format_alphabets] def get_dtg_macro(pos, letter): - return f'DTGMARKER({pos},{letter});' + return f'DTG_MARKER({pos},{letter});' def create_image(font: FreeTypeFont, letter: str, pos: int): """Creates a image of a character in given position and location (anchor).