mirror of
https://github.com/Defent/DMS_Exile.git
synced 2024-08-30 16:52:12 +00:00
Can't stop fiddling with stuff...
This commit is contained in:
parent
62a6cba4a5
commit
8683a16fdc
@ -55,11 +55,14 @@ private _color =
|
||||
default {_difficulty;};
|
||||
};
|
||||
|
||||
/*
|
||||
// Don't think this is really needed
|
||||
if !((toLower _color) in DMS_A3_AllMarkerColors) then
|
||||
{
|
||||
diag_log format ["DMS ERROR :: Color ""%1"" is not a valid marker color! Switching to ""ColorRed""",_color];
|
||||
_color = "ColorRed";
|
||||
};
|
||||
*/
|
||||
|
||||
private _circle = createMarker [format ["DMS_MissionMarkerCircle%1_%2",_num,round(time)], _pos];
|
||||
_circle setMarkerColor _color;
|
||||
|
@ -50,25 +50,13 @@ try
|
||||
}
|
||||
else
|
||||
{
|
||||
_pos params
|
||||
[
|
||||
"_pos_x",
|
||||
"_pos_y"
|
||||
];
|
||||
|
||||
_blacklist_pos params
|
||||
[
|
||||
"_minX",
|
||||
"_minY"
|
||||
];
|
||||
|
||||
_blacklist_parameter params
|
||||
[
|
||||
"_maxX",
|
||||
"_maxY"
|
||||
];
|
||||
|
||||
if ((_pos_x >= _minX) && {_pos_x <= _maxX} && {_pos_y >= _minY} && {_pos_y <= _maxY}) throw _x;
|
||||
if
|
||||
(
|
||||
((_pos select 0) >= (_blacklist_pos select 0)) && // if x is greater than x1 and
|
||||
{(_pos select 0) <= (_blacklist_parameter select 0)} && // if x is less than x2 and
|
||||
{(_pos select 1) >= (_blacklist_pos select 1)} && // if y is greater than y1 and
|
||||
{(_pos select 1) <= (_blacklist_parameter select 1)} // if y is less than y2
|
||||
) throw _x; // blacklisted
|
||||
};
|
||||
} forEach _blacklists;
|
||||
|
||||
|
@ -150,6 +150,11 @@ ___
|
||||
# Changelog:
|
||||
|
||||
### Test Branch:
|
||||
#### June 12, 2016 (3:15 AM CST-America) **Release Candidate 1.2**:
|
||||
* Removed the marker color check in "DMS_fnc_CreateMarker". Invalid marker colors are up to server owners to detect.
|
||||
* Micro-optimized "DMS_fnc_IsPosBlacklisted" for the rectangular blacklist case; also rearranged the statements to be clearer and easier to understand.
|
||||
|
||||
|
||||
#### June 7, 2016 (11:15 PM CST-America) **Release Candidate 1.1**:
|
||||
* Slight optimization of SpawnAIGroup functions (if you have launchers enabled).
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user