Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix get default marker color from configFile #8

Merged
merged 3 commits into from
Jul 11, 2021
Merged

Fix get default marker color from configFile #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53ff898
Fix get default marker color from configFile
tekig Jul 11, 2021
77efe4f
Fixed marker color is not correctly detected
tekig Jul 11, 2021
5921fe0
Fix color on dedication server
tekig Jul 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 26 additions & 42 deletions addons/@ocap/addons/ocap/functions/fn_handleMarkers.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@

ocap_markers_tracked = []; // Markers which we saves into replay

// On the dedicated server, the color of the markers is blue
{
_x params ["_name", "_color"];
profilenamespace setVariable [_name, _color];
} forEach [
["map_blufor_r", 0],
["map_blufor_g", 0.3],
["map_blufor_b", 0.6],
["map_independent_r", 0],
["map_independent_g", 0.5],
["map_independent_b", 0],
["map_civilian_r", 0.4],
["map_civilian_g", 0],
["map_civilian_b", 0.5],
["map_unknown_r", 0.1],
["map_unknown_g", 0.6],
["map_unknown_b", 0],
["map_opfor_r", 0.5],
["map_opfor_g", 0],
["map_opfor_b", 0]
];

// create CBA event handler to be called on server
ocap_markers_handle = ["ocap_handleMarker", {
params["_eventType", "_mrk_name", "_mrk_owner", "_pos", "_type", "_shape", "_size", "_dir", "_brush", "_color", "_alpha", "_text", "_forceGlobal"];
Expand Down Expand Up @@ -36,50 +58,12 @@ ocap_markers_handle = ["ocap_handleMarker", {
ocap_markers_tracked pushBackUnique _mrk_name;

private _mrk_color = "";
private _mrk_colorRaw = getarray (configfile >> "CfgMarkerColors" >> _color >> "color");
if ((_mrk_colorRaw # 0) isEqualType "" || _color == "Default") then {
_typeSplit = _type select [0, 2];
if (
_color == "ColorEAST" ||
_typeSplit == "o_"
) then {
_mrk_color = "#800000";
} else {
if (
_color == "ColorWEST" ||
_typeSplit == "b_"
) then {
_mrk_color = "#004C99";
} else {
if (
_color == "ColorGUER" ||
_typeSplit == "n_"
) then {
_mrk_color = "#008000";
} else {
if (
_color == "ColorCIV" ||
_typeSplit == "c_"
) then {
_mrk_color = "#660080";
} else {
if (
_color == "ColorUNKNOWN" ||
_typeSplit == "u_"
) then {
_mrk_color = "#B29900";
} else {
_mrk_color = "#000000";
};
};
};
};
};
if (_color == "Default") then {
_mrk_color = (configfile >> "CfgMarkers" >> _type >> "color") call BIS_fnc_colorConfigToRGBA call bis_fnc_colorRGBtoHTML;
} else {
_mrk_colorRaw = getarray (configfile >> "CfgMarkerColors" >> _color >> "color");
_mrk_color = (_mrk_colorRaw call bis_fnc_colorRGBtoHTML);
_mrk_color = (configfile >> "CfgMarkerColors" >> _color >> "color") call BIS_fnc_colorConfigToRGBA call bis_fnc_colorRGBtoHTML;
};

private ["_sideOfMarker"];
if (_mrk_owner isEqualTo objNull) then {
_forceGlobal = true;
Expand Down