Further prep for sqfc (#192)

* update files * apply editorconfig * move icon priority setting to general category
diwako · May 21, 2021 · 81f5d14 · 81f5d14
1 parent 19fc808
commit 81f5d14
Show file tree

Hide file tree

Showing 13 changed files with 205 additions and 147 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,9 +1,59 @@
 root = true
 
 [*]
-charset = utf-8
 end_of_line = crlf
+charset = utf-8
+
+[*.sqf]
 indent_size = 4
+insert_final_newline = true
 indent_style = space
+trim_trailing_whitespace = true
+
+[*.cpp]
+indent_size = 4
 insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.hpp]
+indent_size = 4
+insert_final_newline = true
+indent_style = space
 trim_trailing_whitespace = true
+
+[*.js]
+indent_size = 2
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.xml]
+indent_size = 4
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.paa]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
+
+[*.fsm]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
+
+[*.json]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
diff --git a/.gitattributes b/.gitattributes
@@ -3,3 +3,10 @@
 *.cpp text eol=crlf
 *.paa binary
 *.fsm text eol=crlf
+*.json text eol=crlf
+*.js text eol=crlf
+*.py text eol=crlf
+*.md text eol=crlf
+*.toml text eol=crlf
+*.txt text eol=crlf
+*.xml text eol=crlf
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ keys/*
 *.exe
 *.sqfc
 *.bat
+*.dll
diff --git a/addons/buddy/XEH_PREP.hpp b/addons/buddy/XEH_PREP.hpp
@@ -1 +1 @@
-PREP(pairBuddies);
+PREP(pairBuddies);
diff --git a/addons/buddy/config.cpp b/addons/buddy/config.cpp
@@ -12,4 +12,4 @@
     };
 
 
-#include "CfgEventHandlers.hpp"
+#include "CfgEventHandlers.hpp"
diff --git a/addons/buddy/stringtable.xml b/addons/buddy/stringtable.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project name="diwako_dui">
-    <Package name="buddy">
-        <Key ID="STR_dui_buddy_action">
-            <English>Assign Buddy [HUD]</English>
-            <Czech>Přiřadit buddyho [HUD]</Czech>
-            <French>Assigner Buddy [HUD]</French>
-            <German>Als Buddy markieren [HUD]</German>
-            <Korean>친구로 등록 [HUD]</Korean>
-            <Japanese>バディに登録 [HUD]</Japanese>
-            <Polish>Przydziel do dwójki [HUD]</Polish>
-            <Portuguese>Marcar Parceiro</Portuguese>
-            <Spanish>Marcar Amigo</Spanish>
-            <Russian>Назначить напарников [HUD]</Russian>
-            <Chinesesimp>搭档登录 [HUD]</Chinesesimp>
-            <Chinese>搭檔登錄 [HUD]</Chinese>
-        </Key>
-        <Key ID="STR_dui_buddy_action_remove">
-            <English>Unassign Buddy [HUD]</English>
-            <Czech>Zrušit přiřazení buddyho [HUD]</Czech>
-            <French>Désassigner Buddy [HUD]</French>
-            <German>Buddymarkierung aufheben [HUD]</German>
-            <Korean>친구 해제 [HUD]</Korean>
-            <Japanese>バディを解除 [HUD]</Japanese>
-            <Polish>Usuń z dwójki [HUD]</Polish>
-            <Portuguese>Desmarcar Parceiro</Portuguese>
-            <Spanish>Desmarcar Amigo</Spanish>
-            <Russian>Распустить напарников [HUD]</Russian>
-            <Chinesesimp>搭档解除 [HUD]</Chinesesimp>
-            <Chinese>搭檔解除 [HUD]</Chinese>
-        </Key>
-    </Package>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="diwako_dui">
+    <Package name="buddy">
+        <Key ID="STR_dui_buddy_action">
+            <English>Assign Buddy [HUD]</English>
+            <Czech>Přiřadit buddyho [HUD]</Czech>
+            <French>Assigner Buddy [HUD]</French>
+            <German>Als Buddy markieren [HUD]</German>
+            <Korean>친구로 등록 [HUD]</Korean>
+            <Japanese>バディに登録 [HUD]</Japanese>
+            <Polish>Przydziel do dwójki [HUD]</Polish>
+            <Portuguese>Marcar Parceiro</Portuguese>
+            <Spanish>Marcar Amigo</Spanish>
+            <Russian>Назначить напарников [HUD]</Russian>
+            <Chinesesimp>搭档登录 [HUD]</Chinesesimp>
+            <Chinese>搭檔登錄 [HUD]</Chinese>
+        </Key>
+        <Key ID="STR_dui_buddy_action_remove">
+            <English>Unassign Buddy [HUD]</English>
+            <Czech>Zrušit přiřazení buddyho [HUD]</Czech>
+            <French>Désassigner Buddy [HUD]</French>
+            <German>Buddymarkierung aufheben [HUD]</German>
+            <Korean>친구 해제 [HUD]</Korean>
+            <Japanese>バディを解除 [HUD]</Japanese>
+            <Polish>Usuń z dwójki [HUD]</Polish>
+            <Portuguese>Desmarcar Parceiro</Portuguese>
+            <Spanish>Desmarcar Amigo</Spanish>
+            <Russian>Распустить напарников [HUD]</Russian>
+            <Chinesesimp>搭档解除 [HUD]</Chinesesimp>
+            <Chinese>搭檔解除 [HUD]</Chinese>
+        </Key>
+    </Package>
+</Project>
diff --git a/addons/main/CfgIconStyles.hpp b/addons/main/CfgIconStyles.hpp
@@ -1,74 +1,74 @@
-class diwako_dui_icon_style
-{
-    class standard
-    {
-        name = "$STR_dui_color_standard";
-
-        sql = "\A3\ui_f\data\map\vehicleicons\iconManLeader_ca.paa";
-        medic = "\A3\ui_f\data\map\vehicleicons\iconManMedic_ca.paa";
-        auto_rifleman = "\A3\ui_f\data\map\vehicleicons\iconManMG_ca.paa";
-        at_gunner = "\A3\ui_f\data\map\vehicleicons\iconManAT_ca.paa";
-        engineer = "\A3\ui_f\data\map\vehicleicons\iconManEngineer_ca.paa";
-        explosive_specialist = "\A3\ui_f\data\map\vehicleicons\iconManExplosive_ca.paa";
-        rifleman = "\A3\ui_f\data\map\vehicleicons\iconMan_ca.paa";
-        vehicle_cargo = "a3\ui_f\data\igui\cfg\commandbar\imagecargo_ca.paa";
-        vehicle_driver = "a3\ui_f\data\igui\cfg\commandbar\imagedriver_ca.paa";
-        fire_from_vehicle = "a3\ui_f\data\igui\cfg\simpletasks\types\rifle_ca.paa";
-        vehicle_gunner = "a3\ui_f\data\igui\cfg\commandbar\imagegunner_ca.paa";
-        vehicle_commander = "a3\ui_f\data\igui\cfg\commandbar\imagecommander_ca.paa";
-
-        rank_private = "a3\ui_f\data\GUI\Cfg\Ranks\private_gs.paa";
-        rank_corporal = "a3\ui_f\data\GUI\Cfg\Ranks\corporal_gs.paa";
-        rank_sergeant = "a3\ui_f\data\GUI\Cfg\Ranks\sergeant_gs.paa";
-        rank_lieutenant = "a3\ui_f\data\GUI\Cfg\Ranks\lieutenant_gs.paa";
-        rank_captain = "a3\ui_f\data\GUI\Cfg\Ranks\captain_gs.paa";
-        rank_major = "a3\ui_f\data\GUI\Cfg\Ranks\major_gs.paa";
-        rank_colonel = "a3\ui_f\data\GUI\Cfg\Ranks\colonel_gs.paa";
-
-        buddy = "a3\ui_f_curator\Data\Displays\RscDisplayCurator\modeUnits_ca.paa";
-        buddy_compass = QPATHTO_T(UI\icon_styles\standard\buddy_compass);
-
-        speaking = "\A3\ui_f\data\GUI\RscCommon\RscDebugConsole\feedback_ca.paa";
-        speakingRadio = "\A3\modules_f_curator\Data\portraitRadio_ca.paa";
-    };
-
-    class terry:standard
-    {
-        name = "$STR_dui_icon_terry";
-
-        sql = QPATHTO_T(UI\icon_styles\terry\iconManLeader_ca.paa);
-        medic = QPATHTO_T(UI\icon_styles\terry\iconManMedic_ca.paa);
-        auto_rifleman = QPATHTO_T(UI\icon_styles\terry\iconManMG_ca.paa);
-        at_gunner = QPATHTO_T(UI\icon_styles\terry\iconManAT_ca.paa);
-        engineer = QPATHTO_T(UI\icon_styles\terry\iconManEngineer_ca.paa);
-        explosive_specialist = QPATHTO_T(UI\icon_styles\terry\iconManExplosive_ca.paa);
-        rifleman = QPATHTO_T(UI\icon_styles\terry\iconMan_ca.paa);
-
-        buddy_compass = QPATHTO_T(UI\icon_styles\terry\buddy_compass.paa);
-    };
-
-    class nato:standard
-    {
-        name = "$STR_dui_icon_nato";
-
-        sql = QPATHTO_T(UI\icon_styles\nato\GAR_iconManLeader_ca.paa);
-        medic = QPATHTO_T(UI\icon_styles\nato\GAR_iconManMedic_ca.paa);
-        auto_rifleman = QPATHTO_T(UI\icon_styles\nato\GAR_iconManMG_ca.paa);
-        at_gunner = QPATHTO_T(UI\icon_styles\nato\GAR_iconManAT_ca.paa);
-        engineer = QPATHTO_T(UI\icon_styles\nato\GAR_iconManEngineer_ca.paa);
-        explosive_specialist = QPATHTO_T(UI\icon_styles\nato\GAR_iconManExplosive_ca.paa);
-    };
-
-    class clones:standard
-    {
-        name = "$STR_dui_icon_clones";
-
-        sql = QPATHTO_T(UI\icon_styles\clones\icon_leader.paa);
-        medic = QPATHTO_T(UI\icon_styles\clones\icon_medic.paa);
-        auto_rifleman = QPATHTO_T(UI\icon_styles\clones\icon_mg.paa);
-        at_gunner = QPATHTO_T(UI\icon_styles\clones\icon_at.paa);
-        engineer = QPATHTO_T(UI\icon_styles\clones\icon_engineer.paa);
-        explosive_specialist = QPATHTO_T(UI\icon_styles\clones\icon_grenadier.paa);
-        rifleman = QPATHTO_T(UI\icon_styles\clones\icon_rifleman.paa);
-    };
-};
+class diwako_dui_icon_style
+{
+    class standard
+    {
+        name = "$STR_dui_color_standard";
+
+        sql = "\A3\ui_f\data\map\vehicleicons\iconManLeader_ca.paa";
+        medic = "\A3\ui_f\data\map\vehicleicons\iconManMedic_ca.paa";
+        auto_rifleman = "\A3\ui_f\data\map\vehicleicons\iconManMG_ca.paa";
+        at_gunner = "\A3\ui_f\data\map\vehicleicons\iconManAT_ca.paa";
+        engineer = "\A3\ui_f\data\map\vehicleicons\iconManEngineer_ca.paa";
+        explosive_specialist = "\A3\ui_f\data\map\vehicleicons\iconManExplosive_ca.paa";
+        rifleman = "\A3\ui_f\data\map\vehicleicons\iconMan_ca.paa";
+        vehicle_cargo = "a3\ui_f\data\igui\cfg\commandbar\imagecargo_ca.paa";
+        vehicle_driver = "a3\ui_f\data\igui\cfg\commandbar\imagedriver_ca.paa";
+        fire_from_vehicle = "a3\ui_f\data\igui\cfg\simpletasks\types\rifle_ca.paa";
+        vehicle_gunner = "a3\ui_f\data\igui\cfg\commandbar\imagegunner_ca.paa";
+        vehicle_commander = "a3\ui_f\data\igui\cfg\commandbar\imagecommander_ca.paa";
+
+        rank_private = "a3\ui_f\data\GUI\Cfg\Ranks\private_gs.paa";
+        rank_corporal = "a3\ui_f\data\GUI\Cfg\Ranks\corporal_gs.paa";
+        rank_sergeant = "a3\ui_f\data\GUI\Cfg\Ranks\sergeant_gs.paa";
+        rank_lieutenant = "a3\ui_f\data\GUI\Cfg\Ranks\lieutenant_gs.paa";
+        rank_captain = "a3\ui_f\data\GUI\Cfg\Ranks\captain_gs.paa";
+        rank_major = "a3\ui_f\data\GUI\Cfg\Ranks\major_gs.paa";
+        rank_colonel = "a3\ui_f\data\GUI\Cfg\Ranks\colonel_gs.paa";
+
+        buddy = "a3\ui_f_curator\Data\Displays\RscDisplayCurator\modeUnits_ca.paa";
+        buddy_compass = QPATHTO_T(UI\icon_styles\standard\buddy_compass);
+
+        speaking = "\A3\ui_f\data\GUI\RscCommon\RscDebugConsole\feedback_ca.paa";
+        speakingRadio = "\A3\modules_f_curator\Data\portraitRadio_ca.paa";
+    };
+
+    class terry:standard
+    {
+        name = "$STR_dui_icon_terry";
+
+        sql = QPATHTO_T(UI\icon_styles\terry\iconManLeader_ca.paa);
+        medic = QPATHTO_T(UI\icon_styles\terry\iconManMedic_ca.paa);
+        auto_rifleman = QPATHTO_T(UI\icon_styles\terry\iconManMG_ca.paa);
+        at_gunner = QPATHTO_T(UI\icon_styles\terry\iconManAT_ca.paa);
+        engineer = QPATHTO_T(UI\icon_styles\terry\iconManEngineer_ca.paa);
+        explosive_specialist = QPATHTO_T(UI\icon_styles\terry\iconManExplosive_ca.paa);
+        rifleman = QPATHTO_T(UI\icon_styles\terry\iconMan_ca.paa);
+
+        buddy_compass = QPATHTO_T(UI\icon_styles\terry\buddy_compass.paa);
+    };
+
+    class nato:standard
+    {
+        name = "$STR_dui_icon_nato";
+
+        sql = QPATHTO_T(UI\icon_styles\nato\GAR_iconManLeader_ca.paa);
+        medic = QPATHTO_T(UI\icon_styles\nato\GAR_iconManMedic_ca.paa);
+        auto_rifleman = QPATHTO_T(UI\icon_styles\nato\GAR_iconManMG_ca.paa);
+        at_gunner = QPATHTO_T(UI\icon_styles\nato\GAR_iconManAT_ca.paa);
+        engineer = QPATHTO_T(UI\icon_styles\nato\GAR_iconManEngineer_ca.paa);
+        explosive_specialist = QPATHTO_T(UI\icon_styles\nato\GAR_iconManExplosive_ca.paa);
+    };
+
+    class clones:standard
+    {
+        name = "$STR_dui_icon_clones";
+
+        sql = QPATHTO_T(UI\icon_styles\clones\icon_leader.paa);
+        medic = QPATHTO_T(UI\icon_styles\clones\icon_medic.paa);
+        auto_rifleman = QPATHTO_T(UI\icon_styles\clones\icon_mg.paa);
+        at_gunner = QPATHTO_T(UI\icon_styles\clones\icon_at.paa);
+        engineer = QPATHTO_T(UI\icon_styles\clones\icon_engineer.paa);
+        explosive_specialist = QPATHTO_T(UI\icon_styles\clones\icon_grenadier.paa);
+        rifleman = QPATHTO_T(UI\icon_styles\clones\icon_rifleman.paa);
+    };
+};
diff --git a/addons/nametags/functions/fnc_onDraw.sqf b/addons/nametags/functions/fnc_onDraw.sqf
@@ -15,7 +15,7 @@ if (GVAR(useLIS)) then {
     private _skipVicCheck = (netId _target) isEqualTo "1:0"; // only ever true when cursorObject returns the weapon of a
     // unit, per the comment from Pierre MGI at https://community.bistudio.com/wiki/cursorObject
     // we'd like to find the cursorObject regardless, so we piggyback on the LIS check to find the most probable one
-    
+
     private _lis = lineIntersectsSurfaces [
         AGLToASL positionCameraToWorld [0, 0, 0],
         AGLToASL positionCameraToWorld [0, 0, GVAR(renderDistance) + 1],

diff --git a/addons/radar/CfgPointerStyles.hpp b/addons/radar/CfgPointerStyles.hpp
@@ -1,18 +1,18 @@
-class GVAR(pointers) {
-    class standard {
-        name = "$STR_dui_color_standard";
-        file = QPATHTO_T(UI\pointing_styles\standard.paa);
-    };
-    class wedge {
-        name = "$STR_wedge";
-        file = QPATHTO_T(UI\pointing_styles\wedge.paa);
-    };
-    class arrow {
-        name = "$STR_cfg_markers_arrow";
-        file = QPATHTO_T(UI\pointing_styles\arrow.paa);
-    };
-    class arrowhead {
-        name = "$STR_dui_radar_pointer_arrowhead";
-        file = QPATHTO_T(UI\pointing_styles\arrowhead.paa);
-    };
-};
+class GVAR(pointers) {
+    class standard {
+        name = "$STR_dui_color_standard";
+        file = QPATHTO_T(UI\pointing_styles\standard.paa);
+    };
+    class wedge {
+        name = "$STR_wedge";
+        file = QPATHTO_T(UI\pointing_styles\wedge.paa);
+    };
+    class arrow {
+        name = "$STR_cfg_markers_arrow";
+        file = QPATHTO_T(UI\pointing_styles\arrow.paa);
+    };
+    class arrowhead {
+        name = "$STR_dui_radar_pointer_arrowhead";
+        file = QPATHTO_T(UI\pointing_styles\arrowhead.paa);
+    };
+};
diff --git a/addons/radar/XEH_preInit.sqf b/addons/radar/XEH_preInit.sqf
@@ -97,6 +97,15 @@ if (isClass (configfile >> "CfgPatches" >> "ace_medical")) then {
     GVAR(ace_medic) = false;
 };
 
+[
+    QGVAR(icon_priority_setting)
+    ,"LIST"
+    ,[localize "STR_dui_namelist_icon_priority", localize "STR_dui_namelist_icon_priority_desc"]
+    ,[CBA_SETTINGS_CAT, _curCat]
+    ,[[0, 1], [localize "STR_dui_namelist_icon_priority_setting0", localize "STR_dui_namelist_icon_priority_setting1"], 1]
+    ,true
+] call CBA_fnc_addSetting;
+
 private _curCat = localize "STR_dui_cat_compass";
 
 [
@@ -466,15 +475,6 @@ if (isClass(configfile >> "CfgPatches" >> "diwako_dui_buddy")) then {
     diwako_dui_namelist_only_buddy_icon = false;
 };
 
-[
-    QGVAR(icon_priority_setting)
-    ,"LIST"
-    ,[localize "STR_dui_namelist_icon_priority", localize "STR_dui_namelist_icon_priority_desc"]
-    ,[CBA_SETTINGS_CAT, _curCat]
-    ,[[0, 1], [localize "STR_dui_namelist_icon_priority_setting0", localize "STR_dui_namelist_icon_priority_setting1"], 1]
-    ,true
-] call CBA_fnc_addSetting;
-
 [
     "diwako_dui_namelist_width"
     ,"SLIDER"

diff --git a/addons/radar/functions/fnc_compassPFH.sqf b/addons/radar/functions/fnc_compassPFH.sqf
@@ -39,7 +39,7 @@ if ([_player] call EFUNC(main,canHudBeShown)) then {
         {diwako_dui_enable_compass_dir in [1, 2, 3, 4] &&
         {diwako_dui_enable_compass_dir isEqualTo 1 && {!(isNull objectParent _player)} ||
         {diwako_dui_enable_compass_dir isEqualTo 2} ||
-        {diwako_dui_enable_compass_dir isEqualTo 3 && {private _veh = (vehicle _player); _veh isNotEqualTo _player && {(driver _veh) isEqualTo _player}}} || 
+        {diwako_dui_enable_compass_dir isEqualTo 3 && {private _veh = (vehicle _player); _veh isNotEqualTo _player && {(driver _veh) isEqualTo _player}}} ||
         {diwako_dui_enable_compass_dir isEqualTo 4 && {([_player] call FUNC(getGPS)) isNotEqualTo ""}}
         }}) then {
         private _dirCalc = (round _dir) mod 360;
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,4 @@ keys/* @@
     *.exe
     *.sqfc
     *.bat
+    *.dll
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@
		};


		#include "CfgEventHandlers.hpp"
		#include "CfgEventHandlers.hpp"