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

convert map-gestures to cba hashes (#4187)

Browse Source
This commit is contained in:
commy2 2016-07-30 17:17:52 +02:00 committed by Glowbal
parent 1f6b10c4cb
commit 46adfe1150
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/map_gestures/functions/fnc_drawMapGestures.sqf
View File

@ -46,8 +46,8 @@ params ["_mapHandle"];
_grpName = groupID _group; _grpName = groupID _group;
// If color settings for the group exist, then use those, otherwise fall back to the default colors // If color settings for the group exist, then use those, otherwise fall back to the default colors
_color = if (HASH_HASKEY(GVAR(GroupColorConfigurationMapping),_grpName)) then { _color = if ([GVAR(GroupColorConfigurationMapping), _grpName] call CBA_fnc_hashHasKey) then {
(GVAR(GroupColorConfigurations) select (HASH_GET(GVAR(GroupColorConfigurationMapping),_grpName))) select (_x != leader _group) (GVAR(GroupColorConfigurations) select ([GVAR(GroupColorConfigurationMapping), _grpName] call CBA_fnc_hashGet)) select (_x != leader _group)
} else { } else {
if (_x == leader _group) then {GVAR(defaultLeadColor)} else {GVAR(defaultColor)}; if (_x == leader _group) then {GVAR(defaultLeadColor)} else {GVAR(defaultColor)};
}; };

6
addons/map_gestures/functions/fnc_moduleGroupSettings.sqf
View File

@ -31,15 +31,15 @@ if (!([_color] call FUNC(isValidColorArray))) exitWith {ERROR("color is not a va
// If we already have color configurations from another source, use those, otherwise use default. // If we already have color configurations from another source, use those, otherwise use default.
_configurations = if (isNil QGVAR(GroupColorConfigurations)) then { [] } else { +GVAR(GroupColorConfigurations) }; _configurations = if (isNil QGVAR(GroupColorConfigurations)) then { [] } else { +GVAR(GroupColorConfigurations) };
_configurationGroupMappings = if(isNil QGVAR(GroupColorConfigurationMapping)) then { HASH_CREATE } else { +GVAR(GroupColorConfigurationMapping) }; _configurationGroupMappings = if(isNil QGVAR(GroupColorConfigurationMapping)) then { [] call CBA_fnc_hashCreate } else { +GVAR(GroupColorConfigurationMapping) };
// Save custom color configuration and keep the index of the entry. // Save custom color configuration and keep the index of the entry.
_configurationIndex = _configurations pushBack [_leadColor, _color]; _configurationIndex = _configurations pushBack [_leadColor, _color];
// Add all synchronized groups and reference custom configuration for them // Add all synchronized groups and reference custom configuration for them
{ {
HASH_SET(_configurationGroupMappings,groupID (group _x),_configurationIndex); [_configurationGroupMappings, groupID group _x, _configurationIndex] call CBA_fnc_hashSet;
} count _units; } forEach _units;
[QGVAR(GroupColorConfigurations), _configurations, false, true] call EFUNC(common,setSetting); [QGVAR(GroupColorConfigurations), _configurations, false, true] call EFUNC(common,setSetting);
[QGVAR(GroupColorConfigurationMapping), _configurationGroupMappings, false, true] call EFUNC(common,setSetting); [QGVAR(GroupColorConfigurationMapping), _configurationGroupMappings, false, true] call EFUNC(common,setSetting);