Merge pull request #2036 from acemod/mapToolsOnOtherMaps

MapTools work on children of itemMap
acemod · Aug 8, 2015 · 7c7fb35 · 7c7fb35
2 parents 054ac34 + d8c3666
commit 7c7fb35
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/addons/maptools/functions/fnc_canUseMapTools.sqf b/addons/maptools/functions/fnc_canUseMapTools.sqf
@@ -14,7 +14,13 @@
 
 visibleMap &&
 {alive ACE_player} &&
-{"ItemMap" in (assignedItems ACE_player)} &&
+{
+    scopeName "hasMap";
+    {
+        if (_x isKindOf ["ItemMap", configFile >> "CfgWeapons"]) exitWith {true breakOut "hasMap"};
+    } forEach (assignedItems ACE_player);
+    false
+} &&
 {"ACE_MapTools" in (items ACE_player)} &&
 {!GVAR(mapTool_isDragging)} &&
 {!GVAR(mapTool_isRotating)}