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

Fix Colors + Debug Trace

Browse Source
This commit is contained in:
PabstMirror 2015-08-23 14:25:41 -05:00
parent f35b82ddb9
commit a82e5b5436
10 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/markers/XEH_preInit.sqf
View File

@ -47,7 +47,7 @@ if (isNil QGVAR(MarkerColorsCache)) then {
};
} forEach _rgba;
_rgba params ["_red", "_green", "_blue", "_alpha"];
_icon = format ["#(argb,8,8,3)color(%1,%2,%3,%4)", _red, _green, _blue, _blue];
_icon = format ["#(argb,8,8,3)color(%1,%2,%3,%4)", _red, _green, _blue, _alpha];
GVAR(MarkerColorsCache) pushBack [_name, _a, _icon];
};

3
addons/markers/functions/fnc_initInsertMarker.sqf
View File

@ -23,7 +23,8 @@
disableserialization;
params ["_display"];
TRACE_1("params",_display);
//Can't place markers when can't interact
if (!([ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith))) exitWith {
_display closeDisplay 2; //emulate "Cancel" button

1
addons/markers/functions/fnc_mapDrawEH.sqf
View File

@ -18,6 +18,7 @@
private ["_sizeX", "_sizeY", "_textureConfig", "_texture", "_markerSize", "_markerShadow", "_colorConfig", "_drawColor"];
params ["_theMap"];
// TRACE_1("params",_theMap);
//Only show if marker place is open:
if (isNull (findDisplay 54)) exitWith {};

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

@ -19,6 +19,8 @@
private ["_data", "_config"];
params ["_ctrl", "_index"];
TRACE_2("params",_ctrl,_index);
_data = _ctrl lbValue _index;
GVAR(curSelMarkerColor) = _index;

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

@ -19,6 +19,8 @@
private ["_data", "_config"];
params ["_ctrl", "_index"];
TRACE_2("params",_ctrl,_index);
_data = _ctrl lbValue _index;
GVAR(curSelMarkerShape) = _index;

1
addons/markers/functions/fnc_onSliderPosChangedAngle.sqf
View File

@ -19,6 +19,7 @@
private ["_direction"];
params ["_ctrl", "_data"];
TRACE_2("params",_ctrl,_data);
_direction = round _data;
if (_direction < 0) then {

1
addons/markers/functions/fnc_placeMarker.sqf
View File

@ -18,6 +18,7 @@
disableserialization;
params ["_display", "_closeNum"];
TRACE_2("params",_display,_closeNum);
if (_closeNum == 1) then {

4
addons/markers/functions/fnc_sendMarkersJIP.sqf
View File

@ -15,9 +15,11 @@
*/
#include "script_component.hpp"
params ["_logic"];
TRACE_1("params",_logic);
[
QGVAR(setMarkerJIP),
_this,
[_logic],
[GETGVAR(allMapMarkers,[]), GETGVAR(allMapMarkersProperties,[]), _logic]
] call EFUNC(common,targetEvent);

3
addons/markers/functions/fnc_setMarkerJIP.sqf
View File

@ -17,9 +17,8 @@
*/
#include "script_component.hpp"
params ["_allMapMarkers", "_allMapMarkersProperties", "_logic"];
TRACE_3("params",_allMapMarkers,_allMapMarkersProperties,_logic);
{
private ["_index", "_data", "_config"];

2
addons/markers/functions/fnc_setMarkerNetwork.sqf
View File

@ -21,6 +21,8 @@ private ["_config"];
params ["_marker", "_data"];
_data params ["_markerClassname", "_colorClassname", "_markerPos", "_markerDir"];
TRACE_2("params",_marker,_data);
_config = (configfile >> "CfgMarkers") >> _markerClassname;
if (!isClass _config) then {