mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Fix Colors + Debug Trace
This commit is contained in:
parent
f35b82ddb9
commit
a82e5b5436
@ -47,7 +47,7 @@ if (isNil QGVAR(MarkerColorsCache)) then {
|
|||||||
};
|
};
|
||||||
} forEach _rgba;
|
} forEach _rgba;
|
||||||
_rgba params ["_red", "_green", "_blue", "_alpha"];
|
_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];
|
GVAR(MarkerColorsCache) pushBack [_name, _a, _icon];
|
||||||
};
|
};
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
disableserialization;
|
disableserialization;
|
||||||
params ["_display"];
|
params ["_display"];
|
||||||
|
TRACE_1("params",_display);
|
||||||
|
|
||||||
//Can't place markers when can't interact
|
//Can't place markers when can't interact
|
||||||
if (!([ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith))) exitWith {
|
if (!([ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith))) exitWith {
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
private ["_sizeX", "_sizeY", "_textureConfig", "_texture", "_markerSize", "_markerShadow", "_colorConfig", "_drawColor"];
|
private ["_sizeX", "_sizeY", "_textureConfig", "_texture", "_markerSize", "_markerShadow", "_colorConfig", "_drawColor"];
|
||||||
|
|
||||||
params ["_theMap"];
|
params ["_theMap"];
|
||||||
|
// TRACE_1("params",_theMap);
|
||||||
|
|
||||||
//Only show if marker place is open:
|
//Only show if marker place is open:
|
||||||
if (isNull (findDisplay 54)) exitWith {};
|
if (isNull (findDisplay 54)) exitWith {};
|
||||||
|
@ -19,6 +19,8 @@
|
|||||||
private ["_data", "_config"];
|
private ["_data", "_config"];
|
||||||
|
|
||||||
params ["_ctrl", "_index"];
|
params ["_ctrl", "_index"];
|
||||||
|
TRACE_2("params",_ctrl,_index);
|
||||||
|
|
||||||
_data = _ctrl lbValue _index;
|
_data = _ctrl lbValue _index;
|
||||||
|
|
||||||
GVAR(curSelMarkerColor) = _index;
|
GVAR(curSelMarkerColor) = _index;
|
||||||
|
@ -19,6 +19,8 @@
|
|||||||
private ["_data", "_config"];
|
private ["_data", "_config"];
|
||||||
|
|
||||||
params ["_ctrl", "_index"];
|
params ["_ctrl", "_index"];
|
||||||
|
TRACE_2("params",_ctrl,_index);
|
||||||
|
|
||||||
_data = _ctrl lbValue _index;
|
_data = _ctrl lbValue _index;
|
||||||
|
|
||||||
GVAR(curSelMarkerShape) = _index;
|
GVAR(curSelMarkerShape) = _index;
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
private ["_direction"];
|
private ["_direction"];
|
||||||
|
|
||||||
params ["_ctrl", "_data"];
|
params ["_ctrl", "_data"];
|
||||||
|
TRACE_2("params",_ctrl,_data);
|
||||||
|
|
||||||
_direction = round _data;
|
_direction = round _data;
|
||||||
if (_direction < 0) then {
|
if (_direction < 0) then {
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
disableserialization;
|
disableserialization;
|
||||||
params ["_display", "_closeNum"];
|
params ["_display", "_closeNum"];
|
||||||
|
TRACE_2("params",_display,_closeNum);
|
||||||
|
|
||||||
if (_closeNum == 1) then {
|
if (_closeNum == 1) then {
|
||||||
|
|
||||||
|
@ -15,9 +15,11 @@
|
|||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
|
params ["_logic"];
|
||||||
|
TRACE_1("params",_logic);
|
||||||
|
|
||||||
[
|
[
|
||||||
QGVAR(setMarkerJIP),
|
QGVAR(setMarkerJIP),
|
||||||
_this,
|
[_logic],
|
||||||
[GETGVAR(allMapMarkers,[]), GETGVAR(allMapMarkersProperties,[]), _logic]
|
[GETGVAR(allMapMarkers,[]), GETGVAR(allMapMarkersProperties,[]), _logic]
|
||||||
] call EFUNC(common,targetEvent);
|
] call EFUNC(common,targetEvent);
|
||||||
|
@ -17,9 +17,8 @@
|
|||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
params ["_allMapMarkers", "_allMapMarkersProperties", "_logic"];
|
params ["_allMapMarkers", "_allMapMarkersProperties", "_logic"];
|
||||||
|
TRACE_3("params",_allMapMarkers,_allMapMarkersProperties,_logic);
|
||||||
|
|
||||||
{
|
{
|
||||||
private ["_index", "_data", "_config"];
|
private ["_index", "_data", "_config"];
|
||||||
|
@ -21,6 +21,8 @@ private ["_config"];
|
|||||||
|
|
||||||
params ["_marker", "_data"];
|
params ["_marker", "_data"];
|
||||||
_data params ["_markerClassname", "_colorClassname", "_markerPos", "_markerDir"];
|
_data params ["_markerClassname", "_colorClassname", "_markerPos", "_markerDir"];
|
||||||
|
TRACE_2("params",_marker,_data);
|
||||||
|
|
||||||
|
|
||||||
_config = (configfile >> "CfgMarkers") >> _markerClassname;
|
_config = (configfile >> "CfgMarkers") >> _markerClassname;
|
||||||
if (!isClass _config) then {
|
if (!isClass _config) then {
|
||||||
|
Loading…
Reference in New Issue
Block a user