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

Integrate 1.60 marker shape color map interface (#3860)

Browse Source 
1.60 adds ability to set color and marker type from the map interface
Luckily they use the same values and indexes as ACE,
This PR connects the two systems,
Selecting a color from the 1.60 map display will set the color in the
ace marker display and vice versa
This commit is contained in:
PabstMirror 2016-06-02 09:28:52 -05:00
parent 637b5e02e9
commit b6aaba7f90
5 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/markers/CfgEventHandlers.hpp
View File

@ -16,3 +16,9 @@ class Extended_PostInit_EventHandlers {
init = QUOTE(call COMPILE_FILE(XEH_postInit));
};
};
class Extended_DisplayLoad_EventHandlers {
class RscDiary {
ADDON = QUOTE(_this call FUNC(mapDisplayInitEH));
};
};

1
addons/markers/XEH_PREP.hpp
View File

@ -1,6 +1,7 @@
PREP(getEnabledChannels);
PREP(initInsertMarker);
PREP(mapDisplayInitEH);
PREP(mapDrawEH);
PREP(onLBSelChangedChannel);
PREP(onLBSelChangedColor);

34
addons/markers/functions/fnc_mapDisplayInitEH.sqf Normal file
View File

@ -0,0 +1,34 @@
/*
* Author: PabstMirror
* Handles XEH DisplayLoad for the various map displays (RscDiary)
*
* Arguments:
* 0: Map Display (idd 12,37,52,53) <Display>
*
* Return Value:
* None
*
* Example:
* [display] call ace_markers_fnc_mapDisplayInitEH
*
* Public: No
*/
#include "script_component.hpp"
disableSerialization;
params ["_display"];
TRACE_1("params",_display);
private _bisShapeLB = _display displayctrl 1091;
private _curSelShape = missionNamespace getVariable [QGVAR(curSelMarkerShape), 0];
TRACE_2("shape",_bisShapeLB,_curSelShape);
_bisShapeLB ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChangedShape)}];
_bisShapeLB lbSetCurSel _curSelShape;
private _bisColorLB = _display displayctrl 1090;
private _curSelColor = missionNamespace getVariable [QGVAR(curSelMarkerColor), 0];
TRACE_2("color",_bisColorLB,_curSelColor);
_bisColorLB ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChangedColor)}];
_bisColorLB lbSetCurSel _curSelColor;

12
addons/markers/functions/fnc_onLBSelChangedColor.sqf
View File

@ -26,3 +26,15 @@ GVAR(curSelMarkerColor) = _index;
private _config = (configFile >> "CfgMarkerColors") select _data;
GVAR(currentMarkerColorConfigName) = configName _config;
//Set map display to same color:
private _bisColorLB = switch (false) do {
case (isNull findDisplay 12): {(findDisplay 12) displayCtrl 1090};
case (isNull findDisplay 52): {(findDisplay 52) displayCtrl 1090};
case (isNull findDisplay 53): {(findDisplay 53) displayCtrl 1090};
case (isNull findDisplay 37): {(findDisplay 37) displayCtrl 1090};
default {controlNull};
};
if (_ctrl != _bisColorLB) then { //Don't set what we got a EH from
_bisColorLB lbSetCurSel GVAR(curSelMarkerColor);
};

12
addons/markers/functions/fnc_onLBSelChangedShape.sqf
View File

@ -26,3 +26,15 @@ GVAR(curSelMarkerShape) = _index;
private _config = (configFile >> "CfgMarkers") select _data;
GVAR(currentMarkerConfigName) = configName _config;
//Set map display to same shape:
private _bisShapeLB = switch (false) do {
case (isNull findDisplay 12): {(findDisplay 12) displayCtrl 1091};
case (isNull findDisplay 52): {(findDisplay 52) displayCtrl 1091};
case (isNull findDisplay 53): {(findDisplay 53) displayCtrl 1091};
case (isNull findDisplay 37): {(findDisplay 37) displayCtrl 1091};
default {controlNull};
};
if (_ctrl != _bisShapeLB) then { //Don't set what we got a EH from
_bisShapeLB lbSetCurSel GVAR(curSelMarkerShape);
};