Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm_supply

addons/explosives/CfgVehicles.hpp

@@ -44,31 +44,24 @@ class CfgVehicles {
             class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
         };
 
-        author = "ACE";
+        author = ECSTRING(common,Author);
         _generalMacro = "ACE_DefuseObject";
         displayName = "ACE Defuse Helper";
-        mapSize = 0.2;
-        icon = "iconObject_1x2";
         model = "\A3\Weapons_f\dummyweapon.p3d";
         scope = 1;
-        vehicleClass = "Cargo";
+
         class ACE_Actions {
-            class ACE_MainActions {
-                selection = "";
-                distance = 1;
-                condition = "true";
             class ACE_Defuse {
+                distance = 1;
                 displayName = CSTRING(Defuse);
                 condition = QUOTE([ARR_2(_player,_target)] call FUNC(canDefuse));
                 statement = QUOTE([ARR_2(_player,_target)] call FUNC(startDefuse););
                 exceptions[] = {"isNotSwimming"};
-                    showDisabled = 0;
                 icon = QPATHTOF(UI\Defuse_ca.paa);
-                    priority = 0.8;
-                };
             };
         };
     };
+
     class ACE_Explosives_Place: Items_base_F {
         class EventHandlers {
             class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};

addons/microdagr/functions/fnc_mapOnDrawEH.sqf

@@ -27,7 +27,7 @@ if (GVAR(currentApplicationPage) == 1) then {
     _theMap ctrlMapAnimAdd [0, DUMMY_ZOOM, DUMMY_POS];
     ctrlMapAnimCommit _theMap;
     _size = 412 * _mapSize;
-    _theMap drawIcon [QUOTE(PATHTO_R(images\compass_starInverted.paa)), [1,1,1,1], DUMMY_POS, _size, _size, (-1 * (getDir ACE_player)), '', 0 ];
+    _theMap drawIcon [QUOTE(PATHTO_R(images\compass_starInverted.paa)), [1,1,1,1], DUMMY_POS, _size, _size, (-1 * (([ACE_player] call CBA_fnc_headDir) select 0)), '', 0 ];
     _theMap drawIcon [QUOTE(PATHTO_R(images\compass_needle.paa)), [0.533,0.769,0.76,1], DUMMY_POS, _size, _size, 0, '', 0 ];
 
     if (GVAR(currentWaypoint) != -1) then {
@@ -56,7 +56,7 @@ if (GVAR(currentApplicationPage) == 1) then {
         ctrlMapAnimCommit _theMap;
     };
     _size = 48 * _mapSize;
-    _theMap drawIcon [QUOTE(PATHTO_R(images\icon_self.paa)), [0.533,0.769,0.76,0.75], (getPosASL ACE_player), _size, _size, (getDir ACE_player), '', 0 ];
+    _theMap drawIcon [QUOTE(PATHTO_R(images\icon_self.paa)), [0.533,0.769,0.76,0.75], (getPosASL ACE_player), _size, _size, (([ACE_player] call CBA_fnc_headDir) select 0), '', 0 ];
 
     if (GVAR(settingShowAllWaypointsOnMap)) then {
         _size = 32 * _mapSize;

addons/microdagr/functions/fnc_showApplicationPage.sqf

@@ -38,7 +38,7 @@ if (GVAR(currentApplicationPage) == APP_MODE_INFODISPLAY) then {
         (_display displayCtrl IDC_MODEDISPLAY_MODEPOSTIMECG) ctrlShow false;
         (_display displayCtrl IDC_MODEDISPLAY_MODEPOSTARGETCG) ctrlShow true;
         if (GVAR(currentWaypoint) == -2) then {
-            (_display displayCtrl IDC_MODEDISPLAY_TARGETICON) ctrlSetText "\A3\ui_f\data\igui\rscingameui\rscoptics\laser_designator_iconLaserOn.paa"
+            (_display displayCtrl IDC_MODEDISPLAY_TARGETICON) ctrlSetText QUOTE(PATHTOF(images\icon_menuLaser.paa));
         } else {
             (_display displayCtrl IDC_MODEDISPLAY_TARGETICON) ctrlSetText QPATHTOF(images\icon_menuMark.paa);
         };

addons/microdagr/functions/fnc_updateDisplay.sqf

@@ -47,9 +47,9 @@ case (APP_MODE_INFODISPLAY): {
 
         //Heading:
         _compassAngleText = if (GVAR(settingUseMils)) then {
-            [(floor ((6400 / 360) * (getDir ACE_player))), 4, 0] call CBA_fnc_formatNumber;
+            [(floor ((6400 / 360) * (([ACE_player] call CBA_fnc_headDir) select 0))), 4, 0] call CBA_fnc_formatNumber;
         } else {
-            ([(floor (getDir ACE_player)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
+            ([(floor (([ACE_player] call CBA_fnc_headDir) select 0)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
         };
         (_display displayCtrl IDC_MODEDISPLAY_HEADINGNUM) ctrlSetText _compassAngleText;
 
@@ -107,9 +107,9 @@ case (APP_MODE_INFODISPLAY): {
 case (APP_MODE_COMPASS): {
         //Heading:
         _compassAngleText = if (GVAR(settingUseMils)) then {
-            [(floor ((6400 / 360) * (getDir ACE_player))), 4, 0] call CBA_fnc_formatNumber;
+            [(floor ((6400 / 360) * (([ACE_player] call CBA_fnc_headDir) select 0))), 4, 0] call CBA_fnc_formatNumber;
         } else {
-            ([(floor (getDir ACE_player)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
+            ([(floor (([ACE_player] call CBA_fnc_headDir) select 0)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
         };
         (_display displayCtrl IDC_MODECOMPASS_HEADING) ctrlSetText _compassAngleText;
 

addons/microdagr/gui_controls.hpp

@@ -18,7 +18,7 @@ class controlsBackground {
     };
     class RangefinderConnectedIcon: RscPicture {
         idc = IDC_RANGEFINDERCONNECTEDICON;
-        text = "\A3\ui_f\data\igui\rscingameui\rscoptics\laser_designator_iconLaserOn.paa";
+        text = QUOTE(PATHTOF(images\icon_menuLaser.paa));
         x = X_PART(6.35);
         y = Y_PART(0.1);
         w = W_PART(2.7);
@@ -486,7 +486,7 @@ class controls {
                 onbuttonclick = QUOTE([5] call FUNC(saveCurrentAndSetNewMode));
             };
             class ButtonBL: ButtonTL {
-                text = "\A3\ui_f\data\igui\rscingameui\rscoptics\laser_designator_iconLaserOn.paa";
+                text = QUOTE(PATHTOF(images\icon_menuLaser.paa));
                 x = W_PART(3);
                 y = H_PART(10.5);
                 onbuttonclick = QUOTE(_this call FUNC(appMenuButtonConnectRangefinder));

addons/weather/XEH_postInit.sqf

@@ -29,7 +29,7 @@ GVAR(ACE_rain) = rain;
 };
 
 GVAR(WindInfo) = false;
-["ACE3 Common", QGVAR(WindInfoKey), localize LSTRING(WindInfoKey),
+["ACE3 Common", QGVAR(WindInfoKey), localize LSTRING(WindInfoKeyToggle),
 {
     // Conditions: canInteract
     if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
@@ -39,7 +39,8 @@ GVAR(WindInfo) = false;
 },
 {false},
 [37, [true, false, false]], false, 0] call CBA_fnc_addKeybind; // (SHIFT + K)
-["ACE3 Common", QGVAR(WindInfoKey_hold), localize LSTRING(WindInfoKey_hold),
+
+["ACE3 Common", QGVAR(WindInfoKey_hold), localize LSTRING(WindInfoKeyHold),
 {
     // Conditions: canInteract
     if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};

addons/weather/stringtable.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Weather">
-        <Key ID="STR_ACE_Weather_WindInfoKey">
+        <Key ID="STR_ACE_Weather_WindInfoKeyHold">
             <English>Show Wind Info</English>
             <Polish>Pokaż inf. o wietrze</Polish>
             <Russian>Показать информацию о ветре</Russian>
@@ -13,7 +13,7 @@
             <Czech>Zobrazit údaje o větru</Czech>
             <Portuguese>Mostrar informação do vento</Portuguese>
         </Key>
-        <Key ID="STR_ACE_Weather_WindInfoKey_hold">
+        <Key ID="STR_ACE_Weather_WindInfoKeyToggle">
             <English>Show Wind Info (Toggle)</English>
             <Polish>Pokaż inf. o wietrze (przełącz)</Polish>
             <Russian>Показать информацию о ветре (перекл.)</Russian>