Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion addons/artillerytables/functions/fnc_adjustFire.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ params ["_gunPos", "_targetPos", "_adjustEast", "_adjustNorth", "_adjustUp", "_m
//DEFAULT_AIR_FRICTION == -0.00006
//MK6_82mm_AIR_FRICTION == -0.0001

private _resultPos = [_adjustEast + _targetPos select 0, _adjustNorth + _targetPos select 1, _adjustUp + _targetPos select 2];
private _resultPos = [_adjustEast + (_targetPos select 0), _adjustNorth + (_targetPos select 1), _adjustUp + (_targetPos select 2)];
Comment thread
PabstMirror marked this conversation as resolved.
Outdated

private _returns = [_gunPos, _resultPos, _muzzleVelocity, _highAngle, _airFriction, _temperature, _airDensity, _windDir, _windSpeed] call FUNC(calculateSolution);

Expand Down
2 changes: 1 addition & 1 deletion addons/frag/functions/fnc_frago.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if (GVAR(reflectionsEnabled)) then {
if (_fragCount > _maxFrags) exitWith {};
Comment thread
LinkIsGrim marked this conversation as resolved.
} forEach _targets;
TRACE_1("targeted",_fragCount);
if (_fragCount > _maxFrags) exitWith {};
if (_fragCount > _maxFrags) exitWith { _fragCount };
private _randomCount = ceil ((_maxFrags - _fragCount) * 0.35);
TRACE_1("",_randomCount);
private _sectorSize = 360 / (_randomCount max 1);
Expand Down
4 changes: 2 additions & 2 deletions addons/interaction/functions/fnc_getGlassDoor.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* 2: Door name <STRING>
*
* Return Value:
* 0: Door Name <STRING>
* 0: Door Name <STRING><NIL>
Comment thread
PabstMirror marked this conversation as resolved.
Outdated
*
* Example:
* [player, target] call ace_interaction_fnc_getGlassDoor
Expand Down Expand Up @@ -61,6 +61,6 @@ private _lowestDistance = 0;
} forEach _doorPos;

// Check if we have a door or if it is the glass part
if ((isNil "_door") || ((_door find "glass") != -1)) exitWith {};
if ((isNil "_door") || ((_door find "glass") != -1)) exitWith {}; // line has never worked?
Comment thread
PabstMirror marked this conversation as resolved.

_door
2 changes: 2 additions & 0 deletions addons/slideshow/functions/fnc_createSlideshow.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ params [
// Verify data
if (_objects isEqualTo []) exitWith {
ERROR("Slideshow Objects field must NOT be empty!");
-1
};
if (count _images != count _names || {_images isEqualTo []} || {_names isEqualTo []}) exitWith {
ERROR("Slideshow Images or Names fields must NOT be empty and must have equal number of items!");
-1
};

// If no controllers use objects as controllers
Expand Down
1 change: 1 addition & 0 deletions addons/tagging/functions/fnc_tag.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ params [

if (isNull _unit || {_texture == ""}) exitWith {
ERROR_2("Tag parameters invalid. Unit: %1, Texture: %2",_unit,_texture);
false
};

private _isVehicleTag = false;
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/functions/fnc_setAdvancedElement.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ params ["_element", "_show", ["_showHint", false, [true]], ["_force", false, [tr
_element = toLowerANSI _element;

private _cachedElement = GVAR(configCache) get _element;
if (isNil "_cachedElement") exitWith {TRACE_1("nil element",_this)};
if (isNil "_cachedElement") exitWith {TRACE_1("nil element",_this); false };

if (!_force && {!GVAR(allowSelectiveUI)}) exitWith {
TRACE_1("not allowed",_this);
Expand Down
2 changes: 2 additions & 0 deletions addons/ui/functions/fnc_setElementVisibility.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ params [

if (_source == "" || {_element == ""}) exitWith {
WARNING("Source or Element may not be empty strings!");
false
};

_element = toLowerANSI _element;

// Verify element is bound
if !(_element in GVAR(configCache)) exitWith {
WARNING_2("Element '%1' does not exist - modification by '%2' failed.",_element,_source);
false
};

private _setElement = GVAR(elementsSet) get _element;
Expand Down
Loading