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

MicroDAGR - Allow use in vehicles

Browse Source 
Can't show minimap display in turret view (cameraView = "gunner"), but
can bring up the interactive dialog
This commit is contained in:
PabstMirror 2015-04-04 14:35:24 -05:00
parent 1ee698179c
commit 6ec0859f85
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/microdagr/CfgVehicles.hpp
View File

@ -11,7 +11,7 @@ class CfgVehicles {
showDisabled = 0; showDisabled = 0;
priority = 0.2; priority = 0.2;
icon = QUOTE(PATHTOF(UI\icon_microDAGR.paa)); icon = QUOTE(PATHTOF(UI\icon_microDAGR.paa));
exceptions[] = {"notOnMap"}; exceptions[] = {"notOnMap", "isNotInside"};
}; };
class GVAR(configure) { class GVAR(configure) {
//Opens the dialog //Opens the dialog
@ -21,7 +21,7 @@ class CfgVehicles {
showDisabled = 0; showDisabled = 0;
priority = 0.1; priority = 0.1;
icon = QUOTE(PATHTOF(UI\icon_microDAGR.paa)); icon = QUOTE(PATHTOF(UI\icon_microDAGR.paa));
exceptions[] = {"notOnMap"}; exceptions[] = {"notOnMap", "isNotInside"};
}; };
class GVAR(close) { class GVAR(close) {
displayName = "$STR_ACE_microdagr_closeUnit"; displayName = "$STR_ACE_microdagr_closeUnit";
@ -30,7 +30,7 @@ class CfgVehicles {
showDisabled = 0; showDisabled = 0;
priority = 0.3; priority = 0.3;
icon = QUOTE(PATHTOF(UI\icon_microDAGR.paa)); icon = QUOTE(PATHTOF(UI\icon_microDAGR.paa));
exceptions[] = {"notOnMap"}; exceptions[] = {"notOnMap", "isNotInside"};
}; };
}; };
}; };

4
addons/microdagr/XEH_clientInit.sqf
View File

@ -7,7 +7,7 @@ if (!hasInterface) exitWith {};
["ACE3", QGVAR(openGPS), (localize "STR_ACE_microdagr_toggleUnit"), ["ACE3", QGVAR(openGPS), (localize "STR_ACE_microdagr_toggleUnit"),
{ {
// canInteractWith (can use on map) // canInteractWith (can use on map)
if !([ACE_player, objNull, ["notOnMap"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if (!("ACE_microDAGR" in (items ace_player))) exitWith {false}; if (!("ACE_microDAGR" in (items ace_player))) exitWith {false};
@ -20,7 +20,7 @@ if (!hasInterface) exitWith {};
["ACE3", QGVAR(closeGPS), (localize "STR_ACE_microdagr_closeUnit"), ["ACE3", QGVAR(closeGPS), (localize "STR_ACE_microdagr_closeUnit"),
{ {
// canInteractWith (can use on map) // canInteractWith (can use on map)
if !([ACE_player, objNull, ["notOnMap"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if (!("ACE_microDAGR" in (items ace_player))) exitWith {false}; if (!("ACE_microDAGR" in (items ace_player))) exitWith {false};
if (GVAR(currentShowMode) == DISPLAY_MODE_CLOSED) exitWith {false}; if (GVAR(currentShowMode) == DISPLAY_MODE_CLOSED) exitWith {false};

4
addons/microdagr/functions/fnc_canShow.sqf
View File

@ -26,11 +26,11 @@ case (DISPLAY_MODE_CLOSED): {_returnValue = true}; //Can always close
case (DISPLAY_MODE_HIDDEN): {_returnValue = true}; //Can always hide case (DISPLAY_MODE_HIDDEN): {_returnValue = true}; //Can always hide
case (DISPLAY_MODE_DIALOG): { case (DISPLAY_MODE_DIALOG): {
_returnValue = ("ACE_microDAGR" in (items ACE_player)) && {[ACE_player, objNull, ["notOnMap"]] call EFUNC(common,canInteractWith)}; _returnValue = ("ACE_microDAGR" in (items ACE_player)) && {[ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)};
}; };
case (DISPLAY_MODE_DISPLAY): { case (DISPLAY_MODE_DISPLAY): {
//Can't have minimap up while zoomed in //Can't have minimap up while zoomed in
_returnValue = (cameraview != "GUNNER") && {"ACE_microDAGR" in (items ACE_player)} && {[ACE_player, objNull, ["notOnMap"]] call EFUNC(common,canInteractWith)}; _returnValue = (cameraview != "GUNNER") && {"ACE_microDAGR" in (items ACE_player)} && {[ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)};
}; };
}; };