Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

map: small fixes

Browse Source
This commit is contained in:
Nicolás Badano 2015-01-17 16:04:48 -03:00
parent 9a790a229a
commit fd4a2192e9
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
addons/map/CfgVehicles.hpp
View File

@ -10,9 +10,9 @@ class CfgVehicles {
class ACE_MapTools { class ACE_MapTools {
displayName = "$STR_ACE_Map_MapTools_Menu"; displayName = "$STR_ACE_Map_MapTools_Menu";
condition = QUOTE(call FUNC(canUseMapTools) || {call FUNC(canUseMapGPS)}); condition = QUOTE((call FUNC(canUseMapTools) || {call FUNC(canUseMapGPS)}));
statement = ""; statement = "";
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Core_notOnMap"}; exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
showDisabled = 0; showDisabled = 0;
priority = 100; priority = 100;
subMenu[] = {"ACE_MapTools", 1}; subMenu[] = {"ACE_MapTools", 1};
@ -20,63 +20,63 @@ class CfgVehicles {
class ACE_MapToolsHide { class ACE_MapToolsHide {
displayName = "$STR_ACE_Map_MapToolsHide"; displayName = "$STR_ACE_Map_MapToolsHide";
condition = QUOTE(call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0}); condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0}));
statement = QUOTE(GVAR(mapTool_Shown) = 0; [] call FUNC(updateMapToolMarkers)); statement = QUOTE(GVAR(mapTool_Shown) = 0; [] call FUNC(updateMapToolMarkers));
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Core_notOnMap"}; exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
showDisabled = 1; showDisabled = 1;
priority = 5; priority = 5;
enableInside = 1; enableInside = 1;
}; };
class ACE_MapToolsShowNormal { class ACE_MapToolsShowNormal {
displayName = "$STR_ACE_Map_MapToolsShowNormal"; displayName = "$STR_ACE_Map_MapToolsShowNormal";
condition = QUOTE(call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 1}); condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 1}));
statement = QUOTE(GVAR(mapTool_Shown) = 1; [] call FUNC(updateMapToolMarkers)); statement = QUOTE(GVAR(mapTool_Shown) = 1; [] call FUNC(updateMapToolMarkers));
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Core_notOnMap"}; exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
showDisabled = 1; showDisabled = 1;
priority = 4; priority = 4;
enableInside = 1; enableInside = 1;
}; };
class ACE_MapToolsShowSmall { class ACE_MapToolsShowSmall {
displayName = "$STR_ACE_Map_MapToolsShowSmall"; displayName = "$STR_ACE_Map_MapToolsShowSmall";
condition = QUOTE(call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 2}); condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 2}));
statement = QUOTE(GVAR(mapTool_Shown) = 2; [] call FUNC(updateMapToolMarkers)); statement = QUOTE(GVAR(mapTool_Shown) = 2; [] call FUNC(updateMapToolMarkers));
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Core_notOnMap"}; exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
showDisabled = 1; showDisabled = 1;
priority = 3; priority = 3;
enableInside = 1; enableInside = 1;
}; };
class ACE_MapToolsAlignNorth { class ACE_MapToolsAlignNorth {
displayName = "$STR_ACE_Map_MapToolsAlignNorth"; displayName = "$STR_ACE_Map_MapToolsAlignNorth";
condition = QUOTE(call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0}); condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0}));
statement = QUOTE(GVAR(mapTool_angle) = 0; [] call FUNC(updateMapToolMarkers)); statement = QUOTE(GVAR(mapTool_angle) = 0; [] call FUNC(updateMapToolMarkers));
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Core_notOnMap"}; exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
showDisabled = 1; showDisabled = 1;
priority = 2; priority = 2;
enableInside = 1; enableInside = 1;
}; };
class ACE_MapToolsAlignCompass { class ACE_MapToolsAlignCompass {
displayName = "$STR_ACE_Map_MapToolsAlignCompass"; displayName = "$STR_ACE_Map_MapToolsAlignCompass";
condition = QUOTE(call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0} && {('ItemCompass' in assigneditems ACE_player) || {'ItemCompass' in assigneditems ACE_player}}); condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0} && {('ItemCompass' in assigneditems ACE_player) || {'ItemCompass' in assigneditems ACE_player}}));
statement = QUOTE(GVAR(mapTool_angle) = getDir ACE_player; [] call FUNC(updateMapToolMarkers)); statement = QUOTE(GVAR(mapTool_angle) = getDir ACE_player; [] call FUNC(updateMapToolMarkers));
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Core_notOnMap"}; exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
showDisabled = 1; showDisabled = 1;
priority = 1; priority = 1;
enableInside = 1; enableInside = 1;
}; };
class ACE_MapGpsShow { class ACE_MapGpsShow {
displayName = "$STR_ACE_Map_MapGpsShow"; displayName = "$STR_ACE_Map_MapGpsShow";
condition = QUOTE(call FUNC(canUseMapGPS) && {!GVAR(mapGpsShow)}); condition = QUOTE((call FUNC(canUseMapGPS) && {!GVAR(mapGpsShow)}));
statement = QUOTE(GVAR(mapGpsShow) = true; [GVAR(mapGpsShow)] call FUNC(openMapGps)); statement = QUOTE(GVAR(mapGpsShow) = true; [GVAR(mapGpsShow)] call FUNC(openMapGps));
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Core_notOnMap"}; exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
showDisabled = 0; showDisabled = 0;
priority = 0; priority = 0;
enableInside = 1; enableInside = 1;
}; };
class ACE_MapGpsHide { class ACE_MapGpsHide {
displayName = "$STR_ACE_Map_MapGpsHide"; displayName = "$STR_ACE_Map_MapGpsHide";
condition = QUOTE(call FUNC(canUseMapGPS) && {GVAR(mapGpsShow)}); condition = QUOTE((call FUNC(canUseMapGPS) && {GVAR(mapGpsShow)}));
statement = QUOTE(GVAR(mapGpsShow) = false; [GVAR(mapGpsShow)] call FUNC(openMapGps)); statement = QUOTE(GVAR(mapGpsShow) = false; [GVAR(mapGpsShow)] call FUNC(openMapGps));
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Core_notOnMap"}; exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
showDisabled = 0; showDisabled = 0;
priority = 0; priority = 0;
enableInside = 1; enableInside = 1;
@ -87,8 +87,8 @@ class CfgVehicles {
class ACE_Actions { class ACE_Actions {
class ACE_CopyMap { class ACE_CopyMap {
displayName = "$STR_ACE_Map_CopyMap"; displayName = "$STR_ACE_Map_CopyMap";
condition = QUOTE([_target] call EFUNC(common,isPlayer) && {'ItemMap' in assigneditems _player} && {'ACE_MapTools' in items _player} && {'ItemMap' in assignedItems _target}); condition = QUOTE(([_target] call EFUNC(common,isPlayer) && {'ItemMap' in assigneditems _player} && {'ACE_MapTools' in items _player} && {'ItemMap' in assignedItems _target}));
statement = QUOTE([ARR_2(_player,_target)] call FUNC(copyMapStart)); statement = QUOTE([ARR_2(_player,_target)] call FUNC(copyMapStart));
showDisabled = 0; showDisabled = 0;
priority = -1; priority = -1;
}; };

2
addons/map/functions/fnc_canUseMapTools.sqf
View File

@ -3,7 +3,7 @@
#include "script_component.hpp" #include "script_component.hpp"
visibleMap && visibleMap &&
{alive player} && {alive ACE_player} &&
{"ItemMap" in (assignedItems ACE_player)} && {"ItemMap" in (assignedItems ACE_player)} &&
{"ACE_MapTools" in (items ACE_player)} && {"ACE_MapTools" in (items ACE_player)} &&
{!GVAR(mapTool_isDragging)} && {!GVAR(mapTool_isDragging)} &&