MapTools - Allow mod maps and compasses to use map tools (#8858)

* allow mod maps and compasses to use map tools * single quotes * Update addons/maptools/CfgVehicles.hpp Co-authored-by: PabstMirror <pabstmirror@gmail.com> * Update addons/maptools/CfgVehicles.hpp Co-authored-by: PabstMirror <pabstmirror@gmail.com>
acemod · May 3, 2022 · 36ae99b · 36ae99b
1 parent f3258ca
commit 36ae99b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/addons/maptools/CfgVehicles.hpp b/addons/maptools/CfgVehicles.hpp
@@ -52,7 +52,7 @@ class CfgVehicles {
                 };
                 class ACE_MapToolsAlignCompass {
                     displayName = CSTRING(MapToolsAlignCompass);
-                    condition = QUOTE((GVAR(mapTool_Shown) != 0) && {'ItemCompass' in assigneditems ACE_player});
+                    condition = QUOTE(GVAR(mapTool_Shown) != 0 && {getUnitLoadout ACE_player param [ARR_2(9, [])] param [ARR_2(3, '')] != ''});
                     statement = QUOTE(GVAR(mapTool_angle) = getDir ACE_player;);
                     exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"};
                     showDisabled = 1;

diff --git a/addons/maptools/functions/fnc_canUseMapTools.sqf b/addons/maptools/functions/fnc_canUseMapTools.sqf
@@ -17,7 +17,7 @@
 
 visibleMap &&
 {alive ACE_player} &&
-{getText (configFile >> "CfgWeapons" >> (assignedItems ACE_player param [0, ""]) >> "simulation") == "ItemMap"} &&
 {"ACE_MapTools" in (ACE_player call EFUNC(common,uniqueItems))} &&
 {!GVAR(mapTool_isDragging)} &&
-{!GVAR(mapTool_isRotating)}
+{!GVAR(mapTool_isRotating)} &&
+{getUnitLoadout ACE_player param [9, []] param [0, ""] != ""}