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

Interact Menu - Add nil handling for condition (#9922)

Browse Source 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
johnb432 2024-04-07 03:11:09 +02:00 committed by GitHub
parent 04ac1d8808
commit f5e8e06c24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/interact_menu/functions/fnc_collectActiveActionTree.sqf
View File

@ -43,12 +43,21 @@ _origActionData params [
"_distance" "_distance"
]; ];
private _result = [_target, ACE_player, _customParams] call _conditionCode;
// Handle nil as false
if (isNil "_result") then {
ERROR_1("Action [%1] bad condition return",_actionName);
_result = false;
};
// Return nothing if the action itself is not active // Return nothing if the action itself is not active
if !([_target, ACE_player, _customParams] call _conditionCode) exitWith { if (!_result) exitWith {
[] []
}; };
// Return nothing if the action is to far (including checking sub actions) [DISABLED FOR NOW ref #2196] // Return nothing if the action is too far (including checking sub actions) [DISABLED FOR NOW ref #2196]
// if (_distanceToBasePoint > _distance) exitWith { // if (_distanceToBasePoint > _distance) exitWith {
// [] // []
// }; // };