Merge pull request #3560 from acemod/unscheduledactions

execute addActionEvents in unscheduled env
This commit is contained in:
commy2 2016-03-08 16:13:43 +01:00
commit 5b877809ed
2 changed files with 2 additions and 2 deletions

View File

@ -45,7 +45,7 @@ if (_actionID == -1) then {
private _addAction = call compile format [ private _addAction = call compile format [
"[ "[
'', '',
{if (inputAction '%1' == 0) exitWith {}; {if (_this call (_x select 0)) then {_this call (_x select 1)}} forEach (((_this select 0) getVariable '%2') select 1 select 2)}, {[{if (inputAction '%1' == 0) exitWith {}; {if (_this call (_x select 0)) then {_this call (_x select 1)}} forEach (((_this select 0) getVariable '%2') select 1 select 2)}, _this] call CBA_fnc_directCall},
nil, nil,
-1, -1,
false, false,

View File

@ -52,7 +52,7 @@ _actionIDs pushBack _id;
private _addAction = call compile format [ private _addAction = call compile format [
"[ "[
'%2', '%2',
{if (inputAction '%1' == 0) then {if (_this call (%3 select 2)) then {_this call (%3 select 3)}} else {_this call (%3 select 1)}}, {[{if (inputAction '%1' == 0) then {if (_this call (%3 select 2)) then {_this call (%3 select 3)}} else {_this call (%3 select 1)}}, _this] call CBA_fnc_directCall},
nil, nil,
%4, %4,
false, false,