Switch to new marker color control

jameslkingsley · Nov 25, 2016 · 44d0d61 · 44d0d61
1 parent 6d8837f
commit 44d0d61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/optionals/arcomm/attributes/reinforcements.hpp b/optionals/arcomm/attributes/reinforcements.hpp
@@ -149,11 +149,9 @@ class Reinforcements {
             class Color {
                 condition = "(false)";
                 identifier = "GroupDetails_Color";
-                type = "COMBO";
+                type = "MARKERCOLOR";
                 width = 0.33;
-                labels[] = {"Black", "Red", "Green", "Blue", "Yellow", "Orange", "Pink"};
-                values[] = {"ColorBlack", "ColorRed", "ColorGreen", "ColorBlue", "ColorYellow", "ColorOrange", "ColorPink"};
-                selected = 0;
+                selected = "ColorBlack";
                 expression = "";
             };
         };

diff --git a/optionals/arcomm/functions/fnc_reinforcement.sqf b/optionals/arcomm/functions/fnc_reinforcement.sqf
@@ -27,7 +27,7 @@ private _destination = [_data, 'Basic_Destination_Control'] call AFUNC(getContro
 private _configureGroup = [_data, 'Advanced_AdvancedToggle_Control'] call AFUNC(getControlValue);
 private _groupLeader = ([_data, 'Advanced_GroupLeader_Control'] call AFUNC(getControlValue)) param [1, ""];
 private _groupName = [_data, 'Advanced_GroupDetails_Name'] call AFUNC(getControlValue);
-private _groupColor = ([_data, 'Advanced_GroupDetails_Color'] call AFUNC(getControlValue)) param [1, "ColorBlack"];
+private _groupColor = [_data, 'Advanced_GroupDetails_Color'] call AFUNC(getControlValue);
 private _loadoutsStr = [_data, 'Advanced_Loadouts_List'] call AFUNC(getControlValue);
 
 if (_unitSelection isEqualTo []) exitWith {};