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

cleanup, don't setVar public if no change

Browse Source
This commit is contained in:
PabstMirror 2016-01-14 16:21:47 -06:00
parent 9a3972de76
commit d2e006397d
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/functions/fnc_statusEffect_localEH.sqf
View File

@ -1,6 +1,6 @@
/* /*
* Author: PabstMirror * Author: PabstMirror
* * Handles locality switch, runs a respawn check and then reapplies all effect events.
* *
* Arguments: * Arguments:
* 0: vehicle that it will be attached to (player or vehicle) <OBJECT> * 0: vehicle that it will be attached to (player or vehicle) <OBJECT>

2
addons/common/functions/fnc_statusEffect_resetVariables.sqf
View File

@ -1,6 +1,6 @@
/* /*
* Author: PabstMirror * Author: PabstMirror
* * Resets all effect numbers to 0 when an object respawns (but does not apply the effect event).
* *
* Arguments: * Arguments:
* 0: vehicle that it will be attached to (player or vehicle) <OBJECT> * 0: vehicle that it will be attached to (player or vehicle) <OBJECT>

14
addons/common/functions/fnc_statusEffect_set.sqf
View File

@ -1,6 +1,6 @@
/* /*
* Author: PabstMirror * Author: PabstMirror
* Adds or removes an id to a status effect and then updates the value * Adds or removes an id to a status effect and will send an event to apply.
* *
* Arguments: * Arguments:
* 0: vehicle that it will be attached to (player or vehicle) <OBJECT> * 0: vehicle that it will be attached to (player or vehicle) <OBJECT>
@ -51,12 +51,18 @@ if ((_effectNumber == -1) && {!_set}) exitWith {
TRACE_2("Set False on nil array, exiting",_set,_effectNumber); TRACE_2("Set False on nil array, exiting",_set,_effectNumber);
}; };
if (_effectNumber == -1) then {_effectNumber = 0}; if (_effectNumber == -1) then {_effectNumber = 0}; //reset (-1/nil) to 0
//if no change: skip sending publicVar and events
private _effectBoolArray = [_effectNumber, count _statusReasons] call FUNC(binarizeNumber); private _effectBoolArray = [_effectNumber, count _statusReasons] call FUNC(binarizeNumber);
TRACE_3("Setting New Value", _set, _statusIndex, _effectBoolArray); TRACE_2("bitArray",_statusIndex,_effectBoolArray);
if (_set isEqualTo (_effectBoolArray select _statusIndex)) exitWith {
TRACE_2("No Change, exiting",_set,_effectBoolArray select _statusIndex);
};
TRACE_2("Setting to new value",_set,_effectBoolArray select _statusIndex);
_effectBoolArray set [_statusIndex, _set]; _effectBoolArray set [_statusIndex, _set];
_effectNumber = _effectBoolArray call FUNC(toBitmask); _effectNumber = _effectBoolArray call FUNC(toBitmask); //Convert array back to number
TRACE_2("Saving globaly",_effectVarName,_effectNumber); TRACE_2("Saving globaly",_effectVarName,_effectNumber);
_object setVariable [_effectVarName, _effectNumber, true]; _object setVariable [_effectVarName, _effectNumber, true];