Self Actions To Open (under equipment)

This commit is contained in:
PabstMirror 2015-03-18 13:46:39 -05:00
parent 5390c3668e
commit 396359ba67
3 changed files with 55 additions and 29 deletions

View File

@ -1,32 +1,58 @@
class CfgVehicles {
class Logic;
class Module_F: Logic {
class ArgumentsBaseUnits {};
class ModuleDescription {};
};
class GVAR(dagrModule): Module_F {
author = "$STR_ACE_Common_ACETeam";
category = "ACE";
displayName = "MicroDAGR Map Fill";
function = QFUNC(moduleMapFill);
scope = 2;
isGlobal = 1;
// icon = QUOTE(PATHTOF(ui\IconLock_ca.paa));
functionPriority = 0;
class Arguments {
class MapDataAvailable {
displayName = "MicroDAGR Map Fill"; // Argument label
description = "How much map data is filled on MicroDAGRs "; // Tooltip description
typeName = "NUMBER"; // Value type, can be "NUMBER", "STRING" or "BOOL"
class values {
class None {name = "Full Satellite + Buildings"; value = MAP_DETAIL_SAT; default = 1;};
class Side {name = "Topographical + Roads"; value = MAP_DETAIL_TOPOROADS;};
class Unique {name = "None (Cannot use map view)"; value = MAP_DETAIL_NONE;};
class Man;
class CAManBase: Man {
class ACE_SelfActions {
class ACE_Equipment {
class GVAR(openMicroDAGR) {
displayName = "$STR_ACE_microdagr_openUnit";
condition = QUOTE(('ACE_microDAGR' in (items _player)));
statement = QUOTE([] call FUNC(openDisplay));
showDisabled = 0;
priority = 0;
icon = QUOTE(PATHTOF(data\icon_microDAGR.paa.paa));
hotkey = "G";
};
class GVAR(closeMicroDAGR) {
displayName = "$STR_ACE_microdagr_closeUnit";
condition = QUOTE(GVAR(currentShowMode) != DISPLAY_MODE_CLOSED);
statement = QUOTE([DISPLAY_MODE_CLOSED] call FUNC(openDisplay));
showDisabled = 0;
priority = 0.1;
icon = QUOTE(PATHTOF(data\icon_microDAGR.paa));
// hotkey = "G";
};
};
};
};
};
class ModuleDescription: ModuleDescription {
description = "Controls how muchdata is filled in the microDAGR items. Less data restricts the map view to show less on the minimap.<br/>Source: microDAGR.pbo";
class Logic;
class Module_F: Logic {
class ArgumentsBaseUnits {};
class ModuleDescription {};
};
class GVAR(dagrModule): Module_F {
author = "$STR_ACE_Common_ACETeam";
category = "ACE";
displayName = "MicroDAGR Map Fill";
function = QFUNC(moduleMapFill);
scope = 2;
isGlobal = 1;
// icon = QUOTE(PATHTOF(ui\IconLock_ca.paa));
functionPriority = 0;
class Arguments {
class MapDataAvailable {
displayName = "MicroDAGR Map Fill"; // Argument label
description = "How much map data is filled on MicroDAGRs "; // Tooltip description
typeName = "NUMBER"; // Value type, can be "NUMBER", "STRING" or "BOOL"
class values {
class None {name = "Full Satellite + Buildings"; value = MAP_DETAIL_SAT; default = 1;};
class Side {name = "Topographical + Roads"; value = MAP_DETAIL_TOPOROADS;};
class Unique {name = "None (Cannot use map view)"; value = MAP_DETAIL_NONE;};
};
};
};
class ModuleDescription: ModuleDescription {
description = "Controls how muchdata is filled in the microDAGR items. Less data restricts the map view to show less on the minimap.<br/>Source: microDAGR.pbo";
};
};
};
};

View File

@ -21,7 +21,7 @@ PARAMS_1(_showType);
if (_showType in [DISPLAY_MODE_CLOSED, DISPLAY_MODE_HIDDEN]) exitWith {true};
//Can't interact then hide gps: TODO: any exceptions?
if (!([] call EGVAR(common,canInteract))) exitWith {false};
if (!([ACE_player, objNull, []] call EGVAR(common,canInteractWith))) exitWith {false};
//Can't have minimap up while zoomed in
if ((_showType == DISPLAY_MODE_DISPLAY) && {cameraview == "GUNNER"}) exitWith {false};

View File

@ -81,8 +81,8 @@ if ((_oldShowMode == DISPLAY_MODE_CLOSED) && {GVAR(currentShowMode) != DISPLAY_M
[_pfID] call CBA_fnc_removePerFrameHandler;
} else {
GVAR(gpsPositionASL) = getPosAsl ace_player;
if (GVAR(currentShowMode) == DISPLAY_MODE_HIDDEN) then {
//If display is hidden, and we can show, then swithc modes:
if ([DISPLAY_MODE_DISPLAY] call FUNC(canShow)) then {
[DISPLAY_MODE_DISPLAY] call FUNC(openDisplay);
};