mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
This commit is contained in:
commit
9b553c1134
@ -10,7 +10,7 @@ class CfgVehicles {
|
||||
statement = QUOTE([DISPLAY_MODE_DISPLAY] call FUNC(openDisplay));
|
||||
showDisabled = 0;
|
||||
priority = 0.2;
|
||||
icon = QUOTE(PATHTOF(data\icon_microDAGR.paa));
|
||||
icon = QUOTE(PATHTOF(UI\icon_microDAGR.paa));
|
||||
exceptions[] = {"notOnMap"};
|
||||
};
|
||||
class GVAR(configure) {
|
||||
@ -20,7 +20,7 @@ class CfgVehicles {
|
||||
statement = QUOTE([DISPLAY_MODE_DIALOG] call FUNC(openDisplay));
|
||||
showDisabled = 0;
|
||||
priority = 0.1;
|
||||
icon = QUOTE(PATHTOF(data\icon_microDAGR.paa));
|
||||
icon = QUOTE(PATHTOF(UI\icon_microDAGR.paa));
|
||||
exceptions[] = {"notOnMap"};
|
||||
};
|
||||
class GVAR(close) {
|
||||
@ -29,7 +29,7 @@ class CfgVehicles {
|
||||
statement = QUOTE([DISPLAY_MODE_CLOSED] call FUNC(openDisplay));
|
||||
showDisabled = 0;
|
||||
priority = 0.3;
|
||||
icon = QUOTE(PATHTOF(data\icon_microDAGR.paa));
|
||||
icon = QUOTE(PATHTOF(UI\icon_microDAGR.paa));
|
||||
exceptions[] = {"notOnMap"};
|
||||
};
|
||||
};
|
||||
@ -73,5 +73,4 @@ class CfgVehicles {
|
||||
MACRO_ADDITEM(ACE_microDAGR,10);
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
BIN
addons/microdagr/UI/icon_microDAGR.paa
Normal file
BIN
addons/microdagr/UI/icon_microDAGR.paa
Normal file
Binary file not shown.
@ -12,6 +12,7 @@ PREP(deviceAddWaypoint);
|
||||
PREP(deviceDeleteWaypoint);
|
||||
PREP(deviceGetWaypoints);
|
||||
PREP(dialogClosedEH);
|
||||
PREP(mapButtonDownEH);
|
||||
PREP(mapDoubleTapEH);
|
||||
PREP(mapOnDrawEH);
|
||||
PREP(modeMapButtons);
|
||||
|
30
addons/microdagr/functions/fnc_mapButtonDownEH.sqf
Normal file
30
addons/microdagr/functions/fnc_mapButtonDownEH.sqf
Normal file
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* Author: PabstMirror
|
||||
* Handles right clicking on the map ('dragging' the map)
|
||||
* Release autotrack if enabled.
|
||||
*
|
||||
* Arguments:
|
||||
* 0: The Map <CONTROL>
|
||||
* 1: MouseButton <NUMBER>
|
||||
* 2: MousePosX <NUMBER>
|
||||
* 3: MousePosY <NUMBER>
|
||||
*
|
||||
* Return Value:
|
||||
* Nothing
|
||||
*
|
||||
* Example:
|
||||
* [minimap,0,0.5,0.5] call ace_microdagr_fnc_mapButtonDownEH
|
||||
*
|
||||
* Public: No
|
||||
*/
|
||||
#include "script_component.hpp"
|
||||
|
||||
PARAMS_4(_theMap,_mouseButton,_xPos,_yPos);
|
||||
|
||||
//Only handle RMB
|
||||
if (_mouseButton != 1) exitWith {};
|
||||
|
||||
if (GVAR(mapAutoTrackPosition)) then {
|
||||
GVAR(mapAutoTrackPosition) = false;
|
||||
[] call FUNC(showApplicationPage);
|
||||
};
|
@ -12,7 +12,7 @@
|
||||
* Nothing
|
||||
*
|
||||
* Example:
|
||||
* [minimap,0,0.5,0.5] call ace_microdagr_fnc_mapOnDrawEH
|
||||
* [minimap,0,0.5,0.5] call ace_microdagr_fnc_mapDoubleTapEH
|
||||
*
|
||||
* Public: No
|
||||
*/
|
||||
|
@ -53,6 +53,7 @@ class controlsBackground {
|
||||
h = H_PART(19);
|
||||
onDraw = QUOTE(_this call FUNC(mapOnDrawEH));
|
||||
onMouseButtonDblClick = QUOTE(_this call FUNC(mapDoubleTapEH));
|
||||
onMouseButtonDown = QUOTE(_this call FUNC(mapButtonDownEH));
|
||||
|
||||
scaleMin = 0.005;
|
||||
scaleMax = 10; //Lets the mini display zoom out far enough
|
||||
@ -113,6 +114,7 @@ class controlsBackground {
|
||||
h = H_PART(19);
|
||||
onDraw = QUOTE(_this call FUNC(mapOnDrawEH));
|
||||
onMouseButtonDblClick = QUOTE(_this call FUNC(mapDoubleTapEH));
|
||||
onMouseButtonDown = QUOTE(_this call FUNC(mapButtonDownEH));
|
||||
|
||||
// ptsPerSquareSea = 5;
|
||||
// ptsPerSquareTxt = 20;
|
||||
|
Loading…
Reference in New Issue
Block a user