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>
This commit is contained in:
Drofseh 2022-05-02 18:40:59 -07:00 committed by GitHub
parent f3258cae98
commit 36ae99b9f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -52,7 +52,7 @@ class CfgVehicles {
}; };
class ACE_MapToolsAlignCompass { class ACE_MapToolsAlignCompass {
displayName = CSTRING(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;); statement = QUOTE(GVAR(mapTool_angle) = getDir ACE_player;);
exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"};
showDisabled = 1; showDisabled = 1;

View File

@ -17,7 +17,7 @@
visibleMap && visibleMap &&
{alive ACE_player} && {alive ACE_player} &&
{getText (configFile >> "CfgWeapons" >> (assignedItems ACE_player param [0, ""]) >> "simulation") == "ItemMap"} &&
{"ACE_MapTools" in (ACE_player call EFUNC(common,uniqueItems))} && {"ACE_MapTools" in (ACE_player call EFUNC(common,uniqueItems))} &&
{!GVAR(mapTool_isDragging)} && {!GVAR(mapTool_isDragging)} &&
{!GVAR(mapTool_isRotating)} {!GVAR(mapTool_isRotating)} &&
{getUnitLoadout ACE_player param [9, []] param [0, ""] != ""}