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

Replace delayed execution functions with new CBA counterparts

Browse Source
This commit is contained in:
jonpas 2016-05-22 15:27:24 +02:00
parent 472e4631d6
commit e7dbcd7b58
108 changed files with 142 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/attach/functions/fnc_attach.sqf
View File

@ -51,7 +51,7 @@ if (_unit == _attachToVehicle) then { //Self Attachment
[_unit, "forceWalk", "ACE_Attach", true] call EFUNC(common,statusEffect_set);
[{[localize LSTRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, []] call EFUNC(common,execNextFrame);
[{[localize LSTRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, []] call CBA_fnc_execNextFrame;
_unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = PLACE_APPROVE;}] call EFUNC(common,AddActionEventHandler)];
_actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(CancelAction)], {GVAR(placeAction) = PLACE_CANCEL}];

2
addons/attach/functions/fnc_detach.sqf
View File

@ -57,7 +57,7 @@ if (toLower _itemName in ["b_ir_grenade", "o_ir_grenade", "i_ir_grenade"]) then
detach _attachedObject;
_attachedObject setPos ((getPos _unit) vectorAdd [0, 0, -1000]);
// Delete attached item after 0.5 seconds
[{deleteVehicle (_this select 0)}, [_attachedObject], 2] call EFUNC(common,waitAndExecute);
[{deleteVehicle (_this select 0)}, [_attachedObject], 2] call CBA_fnc_waitAndExecute;
} else {
// Delete attached item
deleteVehicle _attachedObject;

4
addons/attach/functions/fnc_getChildrenAttachActions.sqf
View File

@ -31,7 +31,7 @@ _actions = [];
if (getText (_item >> "ACE_Attachable") != "") then {
_displayName = getText(_item >> "displayName");
_picture = getText(_item >> "picture");
_action = [_x, _displayName, _picture, {[{_this call FUNC(attach)}, _this] call EFUNC(common,execNextFrame)}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);
_action = [_x, _displayName, _picture, {[{_this call FUNC(attach)}, _this] call CBA_fnc_execNextFrame}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);
_actions pushBack [_action, [], _target];
};
};
@ -44,7 +44,7 @@ _actions = [];
if (getText (_item >> "ACE_Attachable") != "") then {
_displayName = getText(_item >> "displayName");
_picture = getText(_item >> "picture");
_action = [_x, _displayName, _picture, {[{_this call FUNC(attach)}, _this] call EFUNC(common,execNextFrame)}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);
_action = [_x, _displayName, _picture, {[{_this call FUNC(attach)}, _this] call CBA_fnc_execNextFrame}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);
_actions pushBack [_action, [], _target];
};
};

2
addons/attach/functions/fnc_handleGetIn.sqf
View File

@ -36,7 +36,7 @@ if (!isNull _xObject) then {
params ["_detachedLight"];
TRACE_1("delayed delete",_detachedLight);
deleteVehicle _detachedLight;
}, [_xObject], 2] call EFUNC(common,waitAndExecute);
}, [_xObject], 2] call CBA_fnc_waitAndExecute;
(_attachedList select 0) set [0, objNull];
};

2
addons/attach/functions/fnc_handleKilled.sqf
View File

@ -32,7 +32,7 @@ if ((count _attachedList) == 0) exitWith {};
//If it's a vehicle, also delete the attached
if (!(_deadUnit isKindOf "CAManBase")) then {
_xObject setPos ((getPos _deadUnit) vectorAdd [0, 0, -1000]);
[{deleteVehicle (_this select 0)}, [_xObject], 2] call EFUNC(common,waitAndExecute);
[{deleteVehicle (_this select 0)}, [_xObject], 2] call CBA_fnc_waitAndExecute;
};
} forEach _attachedList;

2
addons/captives/XEH_postInit.sqf
View File

@ -4,7 +4,7 @@
// Hold on a little bit longer to ensure anims will work
[{
GVAR(captivityEnabled) = true;
}, [], 0.05] call EFUNC(common,waitAndExecute);
}, [], 0.05] call CBA_fnc_waitAndExecute;
}] call EFUNC(common,addEventHandler);
//Handles when someone starts escorting and then disconnects, leaving the captive attached

2
addons/captives/functions/fnc_moduleHandcuffed.sqf
View File

@ -32,7 +32,7 @@ if (!isServer) exitWith {};
TRACE_2("event",_x,local _x);
["SetHandcuffed", [_x], [_x, true]] call EFUNC(common,targetEvent);
} forEach _units;
}, [_units], 0.05] call EFUNC(common,waitAndExecute);
}, [_units], 0.05] call CBA_fnc_waitAndExecute;
if (!isNull _logic) then {
deleteVehicle _logic;

2
addons/captives/functions/fnc_moduleSurrender.sqf
View File

@ -32,7 +32,7 @@ if (!isServer) exitWith {};
TRACE_2("event",_x,local _x);
["SetSurrendered", [_x], [_x, true]] call EFUNC(common,targetEvent);
} forEach _units;
}, [_units], 0.05] call EFUNC(common,waitAndExecute);
}, [_units], 0.05] call CBA_fnc_waitAndExecute;
if (!isNull _logic) then {
deleteVehicle _logic;

4
addons/captives/functions/fnc_setHandcuffed.sqf
View File

@ -27,7 +27,7 @@ if !(missionNamespace getVariable [QGVAR(captivityEnabled), false]) exitWith {
// It's to soon to call this function, delay it
if (EGVAR(common,settingsInitFinished)) then {
// Settings are already initialized, but the small wait isn't over
[DFUNC(setHandCuffed), _this, 0.05] call EFUNC(common,waitAndExecute);
[DFUNC(setHandCuffed), _this, 0.05] call CBA_fnc_waitAndExecute;
} else {
// Settings are not initialized yet
[DFUNC(setHandCuffed), _this] call EFUNC(common,runAfterSettingsInit);
@ -98,7 +98,7 @@ if (_state) then {
TRACE_2("Adding animChangedEH",_unit,_animChangedEHID);
_unit setVariable [QGVAR(handcuffAnimEHID), _animChangedEHID];
}, [_unit], 0.01] call EFUNC(common,waitAndExecute);
}, [_unit], 0.01] call CBA_fnc_waitAndExecute;
} else {
_unit setVariable [QGVAR(isHandcuffed), false, true];
[_unit, "setCaptive", QGVAR(Handcuffed), false] call EFUNC(common,statusEffect_set);

4
addons/captives/functions/fnc_setSurrendered.sqf
View File

@ -27,7 +27,7 @@ if !(missionNamespace getVariable [QGVAR(captivityEnabled), false]) exitWith {
// It's to soon to call this function, delay it
if (EGVAR(common,settingsInitFinished)) then {
// Settings are already initialized, but the small wait isn't over
[DFUNC(setSurrendered), _this, 0.05] call EFUNC(common,waitAndExecute);
[DFUNC(setSurrendered), _this, 0.05] call CBA_fnc_waitAndExecute;
} else {
// Settings are not initialized yet
[DFUNC(setSurrendered), _this] call EFUNC(common,runAfterSettingsInit);
@ -73,7 +73,7 @@ if (_state) then {
}];
_unit setVariable [QGVAR(surrenderAnimEHID), _animChangedEHID];
};
}, [_unit], 0.01] call EFUNC(common,waitAndExecute);
}, [_unit], 0.01] call CBA_fnc_waitAndExecute;
} else {
_unit setVariable [QGVAR(isSurrendering), false, true];
[_unit, "setCaptive", QGVAR(Surrendered), false] call EFUNC(common,statusEffect_set);

2
addons/common/CfgEventHandlers.hpp
View File

@ -33,7 +33,7 @@ class Extended_InitPost_EventHandlers {
};
class CAManBase {
class GVAR(setName) {
init = QUOTE(if (local (_this select 0)) then {[ARR_2(FUNC(setName),_this)] call FUNC(execNextFrame)};);
init = QUOTE(if (local (_this select 0)) then {[ARR_2(FUNC(setName),_this)] call CBA_fnc_execNextFrame};);
};
class GVAR(muteUnit) {
init = QUOTE(_this call FUNC(muteUnitHandleInitPost));

4
addons/common/functions/fnc_checkPBOs.sqf
View File

@ -79,7 +79,7 @@ if (!isServer) then {
params ["_rscLayer"];
TRACE_2("Hiding Error message after 10 seconds",time,_rscLayer);
_rscLayer cutFadeOut 0.2;
}, [_rscLayer], 10] call FUNC(waitAndExecute);
}, [_rscLayer], 10] call CBA_fnc_waitAndExecute;
};
};
@ -89,7 +89,7 @@ if (!isServer) then {
TRACE_2("Player is alive, showing msg and exiting",time,_text);
_text = composeText [parseText format ["<t align='center'>%1</t>", _text]];
["[ACE] ERROR", _text, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
}, [_text]] call FUNC(waitUntilAndExecute);
}, [_text]] call CBA_fnc_waitUntilAndExecute;
};
};

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

@ -104,7 +104,7 @@ if (_show) then {
if (_timeAlive >= 0) then {
[{
[_this select 0, false, "", [0,0,0], 0] call FUNC(displayIcon);
}, [_iconId], _timeAlive, _timeAlive] call FUNC(waitAndExecute);
}, [_iconId], _timeAlive, _timeAlive] call CBA_fnc_waitAndExecute;
};
} else {

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

@ -33,5 +33,5 @@ if (_time > _lastHintTime + _delay || {_priority >= _lastHintPriority}) then {
GVAR(lastHint) set [0, _time];
GVAR(lastHint) set [1, _priority];
[{if ((_this select 0) == GVAR(lastHint) select 0) then {hintSilent ""};}, [_time], _delay, 0] call FUNC(waitAndExecute);
[{if ((_this select 0) == GVAR(lastHint) select 0) then {hintSilent ""};}, [_time], _delay, 0] call CBA_fnc_waitAndExecute;
};

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

@ -19,4 +19,4 @@ if (!local _this) exitWith {};
[_this, "blockDamage", "fixCollision", true] call FUNC(statusEffect_set);
// re-allow damage after 2 seconds
[{[_this, "blockDamage", "fixCollision", false] call FUNC(statusEffect_set);}, _this, 2] call EFUNC(common,waitAndExecute);
[{[_this, "blockDamage", "fixCollision", false] call FUNC(statusEffect_set);}, _this, 2] call CBA_fnc_waitAndExecute;

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

@ -50,4 +50,4 @@ TRACE_2("Starting Embargo", _varName, _delay);
if (!(_value isEqualTo _curValue)) then {
_this call FUNC(setVariablePublic);
};
}, _this, _delay] call FUNC(waitAndExecute);
}, _this, _delay] call CBA_fnc_waitAndExecute;

4
addons/common/functions/fnc_unloadPersonLocal.sqf
View File

@ -58,10 +58,10 @@ _unit action ["Eject", vehicle _unit];
if ((_unit getVariable "ACE_isUnconscious") and (animationState _unit != _anim)) then {
[_unit, _anim, 2, true] call FUNC(doAnimation);
};
}, [_unit, _anim], 0.5] call FUNC(waitAndExecute);
}, [_unit, _anim], 0.5] call CBA_fnc_waitAndExecute;
};
};
}, [_unit, _emptyPos], 0.5] call FUNC(waitAndExecute);
}, [_unit, _emptyPos], 0.5] call CBA_fnc_waitAndExecute;
[_unit, false, GROUP_SWITCH_ID, side group _unit] call FUNC(switchToGroupSide);

2
addons/concertina_wire/CfgVehicles.hpp
View File

@ -134,7 +134,7 @@ class CfgVehicles {
distance = 4;
condition = "true";
//wait a frame to handle "Do When releasing action menu key" option:
statement = QUOTE([ARR_2({_this call FUNC(deploy)}, [ARR_2(_target,_player)])] call EFUNC(common,execNextFrame));
statement = QUOTE([ARR_2({_this call FUNC(deploy)}, [ARR_2(_target,_player)])] call CBA_fnc_execNextFrame);
showDisabled = 0;
exceptions[] = {};
priority = 5;

2
addons/concertina_wire/functions/fnc_dismount.sqf
View File

@ -18,7 +18,7 @@
if (uiNamespace getVariable [QEGVAR(interact_menu,cursorMenuOpened),false]) exitWith {
[{
_this call FUNC(dismount);
}, _this] call EFUNC(common,execNextFrame);
}, _this] call CBA_fnc_execNextFrame;
};
params ["_wire", "_unit"];

2
addons/concertina_wire/functions/fnc_vehicleDamage.sqf
View File

@ -114,7 +114,7 @@ if (_mode == 1) then {
_vDir = getDir _vehicle;
_vehicle setPosASL (_vPos vectorAdd [-0.35 * sin(_vDir), -0.35 * cos(_vDir), 0]);
// TODO: Needs to be placed in safe distance to wire, so we do not constantly re-spawn new wires
}, [_vehicle, _wire], 0.1] call EFUNC(common,waitAndExecute);
}, [_vehicle, _wire], 0.1] call CBA_fnc_waitAndExecute;
};
//TODO: Create broken geoless wire (two version)

2
addons/disarming/functions/fnc_disarmDropItems.sqf
View File

@ -67,7 +67,7 @@ if (isNull _holder) exitWith {
if (_holder getVariable [QGVAR(holderInUse), false]) exitWith {
[{
_this call FUNC(disarmDropItems);
}, _this] call EFUNC(common,execNextFrame);
}, _this] call CBA_fnc_execNextFrame;
};
_holder setVariable [QGVAR(holderInUse), true];

2
addons/dragging/functions/fnc_startDrag.sqf
View File

@ -39,7 +39,7 @@ _unit selectWeapon primaryWeapon _unit;
[_unit, _target, true] call EFUNC(common,claim);
// can't play action that depends on weapon if it was added the same frame
[{_this playActionNow "grabDrag";}, _unit] call EFUNC(common,execNextFrame);
[{_this playActionNow "grabDrag";}, _unit] call CBA_fnc_execNextFrame;
// move a bit closer and adjust direction when trying to pick up a person
if (_target isKindOf "CAManBase") then {

2
addons/explosives/functions/fnc_addExplosiveActions.sqf
View File

@ -45,7 +45,7 @@ _children = [];
format ["Explosive_%1", _forEachIndex],
format [_name + " (%1)", _itemCount select _forEachIndex],
getText(_x >> "picture"),
{[{_this call FUNC(setupExplosive)}, _this] call EFUNC(common,execNextFrame)},
{[{_this call FUNC(setupExplosive)}, _this] call CBA_fnc_execNextFrame},
{true},
{},
(configName _x)

2
addons/explosives/functions/fnc_detonateExplosive.sqf
View File

@ -49,6 +49,6 @@ if (getNumber (ConfigFile >> "CfgAmmo" >> typeOf (_item select 0) >> "TriggerWhe
if (!isNull _explosive) then {
_explosive setDamage 1;
};
}, [_item select 0], (_item select 1)] call EFUNC(common,waitAndExecute);
}, [_item select 0], (_item select 1)] call CBA_fnc_waitAndExecute;
_result

2
addons/explosives/functions/fnc_dialPhone.sqf
View File

@ -40,7 +40,7 @@ if (_unit == ace_player) then {
[{
playSound3D [QUOTE(PATHTO_R(Data\Audio\Cellphone_Ring.wss)),objNull, false, getPosASL (_this select 1),3.16228,1,75];
(_this select 0) setVariable [QGVAR(Dialing), false, true];
}, [_unit,_explosive select 0], 0.25 * (count _arr - 4)] call EFUNC(common,waitAndExecute);
}, [_unit,_explosive select 0], 0.25 * (count _arr - 4)] call CBA_fnc_waitAndExecute;
[_explosive select 0,(0.25 * (count _arr - 1)) + (_explosive select 2)] call FUNC(startTimer);
};
};

2
addons/explosives/functions/fnc_setupExplosive.sqf
View File

@ -187,7 +187,7 @@ GVAR(TweakedAngle) = 0;
_unit removeMagazine _magClassname;
_unit playActionNow "PutDown";
_unit setVariable [QGVAR(PlantingExplosive), true];
[{_this setVariable [QGVAR(PlantingExplosive), false]}, _unit, 1.5] call EFUNC(common,waitAndExecute);
[{_this setVariable [QGVAR(PlantingExplosive), false]}, _unit, 1.5] call CBA_fnc_waitAndExecute;
};
} else {

2
addons/explosives/functions/fnc_startDefuse.sqf
View File

@ -56,7 +56,7 @@ if (ACE_player != _unit) then {
[_unit, _target] call FUNC(defuseExplosive);
_unit enableAI "MOVE";
_unit enableAI "TARGET";
}, [_unit, _target], _defuseTime] call EFUNC(common,waitAndExecute);
}, [_unit, _target], _defuseTime] call CBA_fnc_waitAndExecute;
};
} else {
_unit playActionNow _actionToPlay;

2
addons/explosives/functions/fnc_startTimer.sqf
View File

@ -25,4 +25,4 @@ TRACE_2("params",_explosive,_delay);
if (!isNull _explosive) then {
[_explosive, -1, [_explosive, 0]] call FUNC(detonateExplosive);
};
}, [_explosive], _delay] call EFUNC(common,waitAndExecute);
}, [_explosive], _delay] call CBA_fnc_waitAndExecute;

2
addons/fastroping/functions/fnc_checkVehicleThread.sqf
View File

@ -21,5 +21,5 @@ params ["_vehicle", "_fries"];
if (isNull _vehicle) then {
deleteVehicle _fries;
} else {
[FUNC(checkVehicleThread), _this, 5] call EFUNC(common,waitAndExecute);
[FUNC(checkVehicleThread), _this, 5] call CBA_fnc_waitAndExecute;
};

4
addons/fastroping/functions/fnc_cutRopes.sqf
View File

@ -36,7 +36,7 @@ _deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
//Only delete the hook first so the rope falls down.
//Note: ropeDetach was used here before, but the command seems a bit broken.
deleteVehicle _hook;
[{{deleteVehicle _x} count _this}, [_ropeTop, _ropeBottom, _dummy], 60] call EFUNC(common,waitAndExecute);
[{{deleteVehicle _x} count _this}, [_ropeTop, _ropeBottom, _dummy], 60] call CBA_fnc_waitAndExecute;
} count _deployedRopes;
_vehicle setVariable [QGVAR(deployedRopes), [], true];
@ -50,4 +50,4 @@ if (isText (_config >> QGVAR(onCut))) then {
[{
_this setVariable [QGVAR(deploymentStage), 0, true];
}, _vehicle, _waitTime] call EFUNC(common,waitAndExecute);
}, _vehicle, _waitTime] call CBA_fnc_waitAndExecute;

10
addons/fastroping/functions/fnc_deployAI.sqf
View File

@ -64,7 +64,7 @@ _deployTime = 0;
if (getText (_config >> QGVAR(onPrepare)) != "") then {
_deployTime = [_vehicle] call (missionNamespace getVariable (getText (_config >> QGVAR(onPrepare))));
};
[{[_this] call FUNC(deployRopes)}, _vehicle, _deployTime] call EFUNC(common,waitAndExecute);
[{[_this] call FUNC(deployRopes)}, _vehicle, _deployTime] call CBA_fnc_waitAndExecute;
driver _vehicle disableAI "MOVE";
DFUNC(deployAIRecursive) = {
@ -80,8 +80,8 @@ DFUNC(deployAIRecursive) = {
params ["_vehicle"];
private _deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
({!(_x select 5)} count (_deployedRopes)) > 0
}, FUNC(deployAIRecursive), _this] call EFUNC(common,waitUntilAndExecute);
}, [_vehicle, _unitsToDeploy], 1] call EFUNC(common,waitAndExecute);
}, FUNC(deployAIRecursive), _this] call CBA_fnc_waitUntilAndExecute;
}, [_vehicle, _unitsToDeploy], 1] call CBA_fnc_waitAndExecute;
} else {
[{
private _deployedRopes = _this getVariable [QGVAR(deployedRopes), []];
@ -89,8 +89,8 @@ DFUNC(deployAIRecursive) = {
}, {
[_this] call FUNC(cutRopes);
driver _this enableAI "MOVE";
}, _vehicle] call EFUNC(common,waitUntilAndExecute);
}, _vehicle] call CBA_fnc_waitUntilAndExecute;
};
};
[FUNC(deployAIRecursive), [_vehicle, _unitsToDeploy], _deployTime + 4] call EFUNC(common,waitAndExecute);
[FUNC(deployAIRecursive), [_vehicle, _unitsToDeploy], _deployTime + 4] call CBA_fnc_waitAndExecute;

2
addons/fastroping/functions/fnc_equipFRIES.sqf
View File

@ -35,6 +35,6 @@ if !(isNumber (_config >> QGVAR(enabled))) then {
[_vehicle] call FUNC(cutRopes);
};
}];
[FUNC(checkVehicleThread), [_vehicle, _fries], 5] call EFUNC(common,waitAndExecute);
[FUNC(checkVehicleThread), [_vehicle, _fries], 5] call CBA_fnc_waitAndExecute;
};
};

2
addons/fastroping/functions/fnc_onCutCommon.sqf
View File

@ -30,7 +30,7 @@ if !(isNull _fries) then {
_this animate ["dvere1_posunZ", 0];
_this animate ["dvere2_posunZ", 0];
_this setVariable [QGVAR(doorsLocked), false, true];
}, _vehicle, 2] call EFUNC(common,waitAndExecute);
}, _vehicle, 2] call CBA_fnc_waitAndExecute;
4
} else {

2
addons/fastroping/functions/fnc_onPrepareCommon.sqf
View File

@ -35,7 +35,7 @@ if !(isNull _fries) then {
[{
_this animate ["extendHookRight", 1];
_this animate ["extendHookLeft", 1];
}, _fries, 2] call EFUNC(common,waitAndExecute);
}, _fries, 2] call CBA_fnc_waitAndExecute;
_waitTime = 4;
};

2
addons/fastroping/functions/fnc_prepareFRIES.sqf
View File

@ -29,4 +29,4 @@ if (isText (_config >> QGVAR(onPrepare))) then {
[{
_this setVariable [QGVAR(deploymentStage), 2, true];
}, _vehicle, _waitTime] call EFUNC(common,waitAndExecute);
}, _vehicle, _waitTime] call CBA_fnc_waitAndExecute;

2
addons/frag/functions/fnc_spallHP.sqf
View File

@ -21,7 +21,7 @@ if ((_this select 0) <= (count GVAR(spallHPData))) then {
// diag_log text format["%1: %2", _forEachIndex, _x];
// } forEach _hp;
// } forEach (_this select 1);
[DFUNC(doSpall), [_this, _forEachIndex]] call EFUNC(common,execNextFrame);
[DFUNC(doSpall), [_this, _forEachIndex]] call CBA_fnc_execNextFrame;
// player sideChat "WEEE";
} forEach (_this select 1);
};

2
addons/gestures/XEH_missionDisplayLoad.sqf
View File

@ -25,7 +25,7 @@ _display displayAddEventHandler ["KeyDown", {
};
TRACE_2("Reloading, blocking gestures",_weapon,_duration);
[{GVAR(ReloadMutex) = true;}, [], _duration] call EFUNC(common,waitAndExecute);
[{GVAR(ReloadMutex) = true;}, [], _duration] call CBA_fnc_waitAndExecute;
};
};
false

4
addons/goggles/XEH_postInit.sqf
View File

@ -90,9 +90,9 @@ GVAR(OldGlasses) = "<null>";
_unit setVariable ["ACE_EyesDamaged", false];
}, _this, 5] call EFUNC(common,waitAndExecute);
}, _this, 5] call CBA_fnc_waitAndExecute;
}, _unit, 25] call EFUNC(common,waitAndExecute);
}, _unit, 25] call CBA_fnc_waitAndExecute;
}] call EFUNC(common,addEventHandler);

2
addons/goggles/functions/fnc_applyDustEffect.sqf
View File

@ -71,7 +71,7 @@ GVAR(DustHandler) = [{
if (GVAR(DustHandler) == -1) then {
GVAR(PostProcessEyes) ppEffectEnable false
};
}, [], 2] call EFUNC(common,waitAndExecute);
}, [], 2] call CBA_fnc_waitAndExecute;
[GVAR(DustHandler)] call CBA_fnc_removePerFrameHandler;
GVAR(DustHandler) = -1;

2
addons/goggles/functions/fnc_applyRotorWashEffect.sqf
View File

@ -50,7 +50,7 @@ if !(_rotorWash select 0) exitWith {
if (GVAR(DustHandler) == -1) then {
GVAR(PostProcessEyes) ppEffectEnable false;
}
}, [], 2] call EFUNC(common,waitAndExecute);
}, [], 2] call CBA_fnc_waitAndExecute;
[GVAR(DustHandler)] call CBA_fnc_removePerFrameHandler;
GVAR(DustHandler) = -1;

2
addons/goggles/functions/fnc_clearGlasses.sqf
View File

@ -34,7 +34,7 @@ if ((stance _unit != "PRONE") && {primaryWeapon _unit != ""} && {currentWeapon _
if (cameraView == "INTERNAL") then {
addCamShake [5, 1.75, 2];
};
}, [], 0.3] call EFUNC(common,waitAndExecute);
}, [], 0.3] call CBA_fnc_waitAndExecute;
call FUNC(removeDirtEffect);
call FUNC(removeRainEffect);

2
addons/grenades/functions/fnc_flare.sqf
View File

@ -36,4 +36,4 @@ _light setLightDayLight true;
_light lightAttachObject [_projectile, [0,0,0]];
//_light attachTo [_projectile, [0,0,0]];
[{deleteVehicle _this}, _light, _timeToLive, 1] call EFUNC(common,waitAndExecute);
[{deleteVehicle _this}, _light, _timeToLive, 1] call CBA_fnc_waitAndExecute;

10
addons/grenades/functions/fnc_flashbangExplosionEH.sqf
View File

@ -36,8 +36,8 @@ if (hasInterface) then {
[{
params ["_light"];
deleteVehicle _light;
}, [_light], 0.2] call EFUNC(common,waitAndExecute);
}, [_light], 0.1] call EFUNC(common,waitAndExecute);
}, [_light], 0.2] call CBA_fnc_waitAndExecute;
}, [_light], 0.1] call CBA_fnc_waitAndExecute;
};
// Affect local AI
@ -67,7 +67,7 @@ _affected = _affected - [ACE_player];
};
_unit setSkill (skill _unit * 50);
}, [_x], 7 * _strength] call EFUNC(common,waitAndExecute);
}, [_x], 7 * _strength] call CBA_fnc_waitAndExecute;
};
} count _affected;
@ -126,12 +126,12 @@ if (hasInterface && {!isNull ACE_player} && {alive ACE_player}) then {
GVAR(flashbangPPEffectCC) ppEffectAdjust [1,1,0,[1,1,1,0],[0,0,0,1],[0,0,0,0]];
GVAR(flashbangPPEffectCC) ppEffectCommit (10 * _strength);
}, [_strength], 7 * _strength] call EFUNC(common,waitAndExecute);
}, [_strength], 7 * _strength] call CBA_fnc_waitAndExecute;
//FULLRECOVERY - end effect
[{
GVAR(flashbangPPEffectCC) ppEffectEnable false;
}, [], 17 * _strength] call EFUNC(common,waitAndExecute);
}, [], 17 * _strength] call CBA_fnc_waitAndExecute;
};
if (_strength > 0.2) then {

4
addons/grenades/functions/fnc_throwGrenade.sqf
View File

@ -32,7 +32,7 @@ if (local _unit) then {
if (getNumber (_config >> QGVAR(flashbang)) == 1) then {
private _fuzeTime = getNumber (_config >> "explosionTime");
[FUNC(flashbangThrownFuze), [_projectile], _fuzeTime] call EFUNC(common,waitAndExecute);
[FUNC(flashbangThrownFuze), [_projectile], _fuzeTime] call CBA_fnc_waitAndExecute;
};
};
@ -42,7 +42,7 @@ if (getNumber (_config >> QGVAR(flare)) == 1) then {
private _color = getArray (_config >> QGVAR(color));
private _intensity = _color deleteAt 3;
[FUNC(flare), [_projectile, _color, _intensity, _timeToLive], _fuzeTime, 0] call EFUNC(common,waitAndExecute);
[FUNC(flare), [_projectile, _color, _intensity, _timeToLive], _fuzeTime, 0] call CBA_fnc_waitAndExecute;
};
// handle throw modes

4
addons/huntir/functions/fnc_handleFired.sqf
View File

@ -50,5 +50,5 @@ if (!hasInterface) exitWith {};
_huntir setVectorUp [0, 0, 1];
};
}, 0, [_huntir]] call CBA_fnc_addPerFrameHandler;
}, [getPosATL _projectile vectorAdd [0, 0, 50]], 2, 0] call EFUNC(common,waitAndExecute);
}, [_projectile], 5, 0] call EFUNC(common,waitAndExecute);
}, [getPosATL _projectile vectorAdd [0, 0, 50]], 2, 0] call CBA_fnc_waitAndExecute;
}, [_projectile], 5, 0] call CBA_fnc_waitAndExecute;

6
addons/huntir/functions/fnc_huntir.sqf
View File

@ -90,9 +90,9 @@ createDialog "ace_huntir_cam_dialog_off";
GVAR(done) = true;
closedialog 0;
HUNTIR_BACKGROUND_LAYER_ID cutText ["", "PLAIN"];
}, [], 3, 0] call EFUNC(common,waitAndExecute);
}, [], 3, 0] call CBA_fnc_waitAndExecute;
};
};
}, __TYPE_WRITER_DELAY, []] call CBA_fnc_addPerFrameHandler;
}, [], 0.5, 0] call EFUNC(common,waitAndExecute);
}, [], 1, 0] call EFUNC(common,waitAndExecute);
}, [], 0.5, 0] call CBA_fnc_waitAndExecute;
}, [], 1, 0] call CBA_fnc_waitAndExecute;

2
addons/inventory/functions/fnc_inventoryDisplayLoad.sqf
View File

@ -53,7 +53,7 @@ _filter ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChanged)}];
// readd "All" filter to last position and select it
_index = _filter lbAdd _nameAll;
_filter lbSetCurSel _index;
}, [_filter]] call EFUNC(common,execNextFrame);
}, [_filter]] call CBA_fnc_execNextFrame;
// monitor changes that can happen and force our update
private _dummyControl = _display ctrlCreate ["RscMapControl", -1];

2
addons/inventory/functions/fnc_onLBSelChanged.sqf
View File

@ -24,4 +24,4 @@ GVAR(selectedFilterIndex) = _index;
params ["_display"];
[_display] call FUNC(forceItemListUpdate);
}, [ctrlParent _filter]] call EFUNC(common,execNextFrame);
}, [ctrlParent _filter]] call CBA_fnc_execNextFrame;

2
addons/markers/functions/fnc_initInsertMarker.sqf
View File

@ -238,4 +238,4 @@
//Update now and add eventHandler:
[_aceAngleSlider, _curSelAngle] call FUNC(onSliderPosChangedAngle);
_aceAngleSlider ctrlAddEventHandler ["SliderPosChanged", {_this call FUNC(onSliderPosChangedAngle)}];
}, _this] call EFUNC(common,execNextFrame);
}, _this] call CBA_fnc_execNextFrame;

2
addons/markers/functions/fnc_placeMarker.sqf
View File

@ -32,5 +32,5 @@ if (_closeNum == 1) then {
]
]] call EFUNC(common,globalEvent);
}, []] call EFUNC(common,execNextFrame);
}, []] call CBA_fnc_execNextFrame;
};

16
addons/medical/XEH_postInit.sqf
View File

@ -139,11 +139,11 @@ GVAR(effectTimeBlood) = ACE_time;
[{
GVAR(effectBlindingCC) ppEffectAdjust [1,1,0, [1,1,1,0], [0,0,0,1], [0,0,0,0]];
GVAR(effectBlindingCC) ppEffectCommit ((_this select 0) * 2);
}, [_strength], 0.01, 0] call EFUNC(common,waitAndExecute);
}, [_strength], 0.01, 0] call CBA_fnc_waitAndExecute;
[{
GVAR(effectBlindingCC) ppEffectEnable false;
}, [], (_strength * 2) + 0.5, 0] call EFUNC(common,waitAndExecute);
}, [], (_strength * 2) + 0.5, 0] call CBA_fnc_waitAndExecute;
GVAR(effectBlind) = false;
};
@ -206,15 +206,15 @@ GVAR(lastHeartBeatSound) = ACE_time;
[{
GVAR(effectPainCA) ppEffectAdjust [(_this select 0), (_this select 0), false];
GVAR(effectPainCA) ppEffectCommit (_this select 1);
}, [_strength * 0.1, _interval * 0.2], _interval * 0.05, 0] call EFUNC(common,waitAndExecute);
}, [_strength * 0.1, _interval * 0.2], _interval * 0.05, 0] call CBA_fnc_waitAndExecute;
[{
GVAR(effectPainCA) ppEffectAdjust [(_this select 0), (_this select 0), false];
GVAR(effectPainCA) ppEffectCommit 0.01;
}, [_strength * 0.7], _interval * 0.3, 0] call EFUNC(common,waitAndExecute);
}, [_strength * 0.7], _interval * 0.3, 0] call CBA_fnc_waitAndExecute;
[{
GVAR(effectPainCA) ppEffectAdjust [(_this select 0), (_this select 0), false];
GVAR(effectPainCA) ppEffectCommit (_this select 1);
}, [_strength * 0.1, _interval * 0.55], _interval * 0.4, 0] call EFUNC(common,waitAndExecute);
}, [_strength * 0.1, _interval * 0.55], _interval * 0.4, 0] call CBA_fnc_waitAndExecute;
} else {
GVAR(effectPainCA) ppEffectEnable false;
};
@ -228,15 +228,15 @@ GVAR(lastHeartBeatSound) = ACE_time;
[{
GVAR(effectPainCC) ppEffectAdjust [1,1,0, [1,1,1,1], [0,0,0,0], [1,1,1,1], [1 - (_this select 0),1 - (_this select 0),0,0,0,0.2,2]];
GVAR(effectPainCC) ppEffectCommit (_this select 1);
}, [_strength * 0.1, _interval * 0.2], _interval * 0.05, 0] call EFUNC(common,waitAndExecute);
}, [_strength * 0.1, _interval * 0.2], _interval * 0.05, 0] call CBA_fnc_waitAndExecute;
[{
GVAR(effectPainCC) ppEffectAdjust [1,1,0, [1,1,1,1], [0,0,0,0], [1,1,1,1], [1 - (_this select 0),1 - (_this select 0),0,0,0,0.2,2]];
GVAR(effectPainCC) ppEffectCommit 0.01;
}, [_strength * 0.7], _interval * 0.3, 0] call EFUNC(common,waitAndExecute);
}, [_strength * 0.7], _interval * 0.3, 0] call CBA_fnc_waitAndExecute;
[{
GVAR(effectPainCC) ppEffectAdjust [1,1,0, [1,1,1,1], [0,0,0,0], [1,1,1,1], [1 - (_this select 0),1 - (_this select 0),0,0,0,0.2,2]];
GVAR(effectPainCC) ppEffectCommit (_this select 1);
}, [_strength * 0.1, _interval * 0.55], _interval * 0.4, 0] call EFUNC(common,waitAndExecute);
}, [_strength * 0.1, _interval * 0.55], _interval * 0.4, 0] call CBA_fnc_waitAndExecute;
} else {
GVAR(effectPainCC) ppEffectEnable false;
};

4
addons/medical/XEH_preInit.sqf
View File

@ -35,7 +35,7 @@ private _fixStatic = {
1 preloadObject (_this select 0);
}, {
TRACE_1("preload done",_this);
}, [_vehType]] call EFUNC(common,waitUntilAndExecute);
}, [_vehType]] call CBA_fnc_waitUntilAndExecute;
};
};
["StaticWeapon", "init", _fixStatic] call CBA_fnc_addClassEventHandler;
@ -47,7 +47,7 @@ addMissionEventHandler ["Loaded",{
1 preloadObject (_this select 0);
}, {
TRACE_1("preload done",_this);
}, [_x]] call EFUNC(common,waitUntilAndExecute);
}, [_x]] call CBA_fnc_waitUntilAndExecute;
} forEach GVAR(fixedStatics);
}];

2
addons/medical/functions/fnc_addDamageToUnit.sqf
View File

@ -54,7 +54,7 @@ private _debugCode = {
ACE_LOGERROR_6("addDamageToUnit - FAILED - [unit:%1, partNo:%2, addDmg:%3] results:[alive:%4 old:%5 new:%6]", _unit, _partNumber, _damageToAdd, alive _unit, _startDmg, _endDmg);
};
};
[{diag_frameno > (_this select 0)}, _debugCode, [_checkAtFrame, _unit, _startDmg, _damageToAdd, _partNumber]] call EFUNC(common,waitUntilAndExecute);
[{diag_frameno > (_this select 0)}, _debugCode, [_checkAtFrame, _unit, _startDmg, _damageToAdd, _partNumber]] call CBA_fnc_waitUntilAndExecute;
#endif
private _return = [_unit, _selection, (_currentDamage + _damageToAdd), _unit, _typeOfDamage, _hitpointIndex] call FUNC(handleDamage);

2
addons/medical/functions/fnc_addVitalLoop.sqf
View File

@ -27,4 +27,4 @@ if ((_unit getVariable[QGVAR(addedToUnitLoop),false] || !alive _unit) && !_force
// Schedule the loop to be executed again 1 sec later
// @todo: should the loop be started righ away instead?
_unit setVariable [QGVAR(addedToUnitLoop), true, true];
[DFUNC(vitalLoop), [_unit, ACE_time], 1] call EFUNC(common,waitAndExecute);
[DFUNC(vitalLoop), [_unit, ACE_time], 1] call CBA_fnc_waitAndExecute;

2
addons/medical/functions/fnc_bodyCleanupLoop.sqf
View File

@ -27,4 +27,4 @@ if (GVAR(bodiesToDelete) isEqualTo []) exitWith {
};
// Schedule the loop to be executed again 20 sec later
[DFUNC(bodyCleanupLoop), [], 20] call EFUNC(common,waitAndExecute);
[DFUNC(bodyCleanupLoop), [], 20] call CBA_fnc_waitAndExecute;

2
addons/medical/functions/fnc_handleBandageOpening.sqf
View File

@ -117,5 +117,5 @@ if (random(1) <= _reopeningChance) then {
};
// Otherwise something went wrong, we we don't reopen them..
//};
}, [_target, _impact, _part, _injuryIndex, +_injury], _delay] call EFUNC(common,waitAndExecute);
}, [_target, _impact, _part, _injuryIndex, +_injury], _delay] call CBA_fnc_waitAndExecute;
};

2
addons/medical/functions/fnc_handleCreateLitter.sqf
View File

@ -29,7 +29,7 @@ _litterObject = _litterClass createVehicleLocal _position;
_litterObject setDir _direction;
_litterObject setPosATL _position;
// Move the litter next frame to get rid of HORRIBLE spacing, fixes #1112
[{ params ["_object", "_pos"]; _object setPosATL _pos; }, [_litterObject, _position]] call EFUNC(common,execNextFrame);
[{ params ["_object", "_pos"]; _object setPosATL _pos; }, [_litterObject, _position]] call CBA_fnc_execNextFrame;
_maxLitterCount = getArray (configFile >> "ACE_Settings" >> QGVAR(litterSimulationDetail) >> "_values") select GVAR(litterSimulationDetail);
if((count GVAR(allCreatedLitter)) > _maxLitterCount ) then {

4
addons/medical/functions/fnc_handleDamage.sqf
View File

@ -120,11 +120,11 @@ if (_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) exitW
if (_delayedUnconsicous) then {
[{
[_this select 0, true] call FUNC(setUnconscious);
}, [_unit], 0.7] call EFUNC(common,waitAndExecute);
}, [_unit], 0.7] call CBA_fnc_waitAndExecute;
} else {
[{
[_this select 0, true] call FUNC(setUnconscious);
}, [_unit]] call EFUNC(common,execNextFrame);
}, [_unit]] call CBA_fnc_execNextFrame;
};
0.89;
};

2
addons/medical/functions/fnc_init.sqf
View File

@ -86,4 +86,4 @@ _unit setVariable [QGVAR(allLogs), [], true];
// items
[{
_this call FUNC(itemCheck);
}, [_unit], 0.5, 0.1] call EFUNC(common,waitAndExecute);
}, [_unit], 0.5, 0.1] call CBA_fnc_waitAndExecute;

2
addons/medical/functions/fnc_litterCleanupLoop.sqf
View File

@ -30,4 +30,4 @@ if ( (count GVAR(allCreatedLitter)) == 0) exitWith {
};
// Schedule the loop to be executed again 30 sec later
[DFUNC(litterCleanupLoop), [], 30] call EFUNC(common,waitAndExecute);
[DFUNC(litterCleanupLoop), [], 30] call CBA_fnc_waitAndExecute;

2
addons/medical/functions/fnc_medicationEffectLoop.sqf
View File

@ -39,4 +39,4 @@ _amountDecreased = _amountDecreased + _decreaseRate;
if (_amountDecreased >= 1 || (_usedMeds <= 0) || !alive _unit) exitWith {};
// Schedule the loop to be executed again 1 sec later
[DFUNC(medicationEffectLoop), [_unit, _variableName, _amountDecreased, _decreaseRate, _viscosityAdjustmentRate, _painReduceRate], 1] call EFUNC(common,waitAndExecute);
[DFUNC(medicationEffectLoop), [_unit, _variableName, _amountDecreased, _decreaseRate, _viscosityAdjustmentRate, _painReduceRate], 1] call CBA_fnc_waitAndExecute;

2
addons/medical/functions/fnc_playInjuredSound.sqf
View File

@ -76,7 +76,7 @@ if (_pain > 0 && {[_unit] call EFUNC(common,isAwake)}) exitWith {
// Clean up the lock
[{
(_this select 0) setVariable [QGVAR(playingInjuredSound),nil];
}, [_unit], _delay, _delay] call EFUNC(common,waitAndExecute);
}, [_unit], _delay, _delay] call CBA_fnc_waitAndExecute;
};
// Clean up in case there has not been played any sounds.

2
addons/medical/functions/fnc_reviveStateLoop.sqf
View File

@ -53,4 +53,4 @@ if !(_unit getVariable [QGVAR(inReviveState), false]) exitwith {
};
// Schedule the loop to be executed again 1 sec later
[DFUNC(reviveStateLoop), [_unit], 1] call EFUNC(common,waitAndExecute);
[DFUNC(reviveStateLoop), [_unit], 1] call CBA_fnc_waitAndExecute;

2
addons/medical/functions/fnc_setDead.sqf
View File

@ -59,7 +59,7 @@ if (isPLayer _unit) then {
if (!_delaySetDamage) then {
[_unit, 1] call FUNC(setStructuralDamage);
} else {
[FUNC(setStructuralDamage), [_unit, 1]] call EFUNC(common,execNextFrame);
[FUNC(setStructuralDamage), [_unit, 1]] call CBA_fnc_execNextFrame;
};
true;

4
addons/medical/functions/fnc_setUnconscious.sqf
View File

@ -103,7 +103,7 @@ if (GVAR(delayUnconCaptive) == 0) then {
if (_unit getVariable ["ACE_isUnconscious", false]) then {
[_unit, "setCaptive", QGVAR(unconscious), true] call EFUNC(common,statusEffect_set);
};
},[_unit], GVAR(delayUnconCaptive)] call EFUNC(common,waitAndExecute);
},[_unit], GVAR(delayUnconCaptive)] call CBA_fnc_waitAndExecute;
};
_anim = [_unit] call EFUNC(common,getDeathAnim);
@ -113,7 +113,7 @@ _anim = [_unit] call EFUNC(common,getDeathAnim);
if ((_unit getVariable "ACE_isUnconscious") and (animationState _unit != _anim)) then {
[_unit, _anim, 2, true] call EFUNC(common,doAnimation);
};
}, [_unit, _anim], 0.5, 0] call EFUNC(common,waitAndExecute);
}, [_unit, _anim], 0.5, 0] call CBA_fnc_waitAndExecute;
_startingTime = ACE_time;

2
addons/medical/functions/fnc_treatment.sqf
View File

@ -23,7 +23,7 @@ params ["_caller", "_target", "_selectionName", "_className"];
if (uiNamespace getVariable [QEGVAR(interact_menu,cursorMenuOpened),false]) exitwith {
[{
_this call FUNC(treatment);
}, _this] call EFUNC(common,execNextFrame);
}, _this] call CBA_fnc_execNextFrame;
};
if !(_target isKindOf "CAManBase") exitWith {false};

2
addons/medical/functions/fnc_vitalLoop.sqf
View File

@ -45,4 +45,4 @@ if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
};
// Schedule the loop to be executed again 1 sec later
[DFUNC(vitalLoop), [_unit, ACE_time], 1] call EFUNC(common,waitAndExecute);
[DFUNC(vitalLoop), [_unit, ACE_time], 1] call CBA_fnc_waitAndExecute;

2
addons/medical_menu/XEH_postInit.sqf
View File

@ -12,7 +12,7 @@ GVAR(pendingReopen) = false;
GVAR(pendingReopen) = false;
[{
[GVAR(INTERACTION_TARGET)] call FUNC(openMenu);
}, []] call EFUNC(common,execNextFrame);
}, []] call CBA_fnc_execNextFrame;
};
}] call EFUNC(common,addEventhandler);

2
addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf
View File

@ -44,7 +44,7 @@ if (_name isEqualTo "toggle") exitWith {
closeDialog 0;
[{
[_this select 0] call FUNC(openMenu);
}, [_newTarget], 0.1] call EFUNC(common,waitAndExecute);
}, [_newTarget], 0.1] call CBA_fnc_waitAndExecute;
};
// Clean the dropdown options list from all actions

2
addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf
View File

@ -30,7 +30,7 @@ if (!(_newVehicle getVariable [QGVAR(initialized),false]) && !(_newVehicle getVa
//wait for proper turret locality change
[{
["initMortar", [_this], [_this]] call EFUNC(common,globalEvent);
}, _mortar, 0.05] call EFUNC(common,waitAndExecute);
}, _mortar, 0.05] call CBA_fnc_waitAndExecute;
};
}, _newVehicle] call EFUNC(common,runAfterSettingsInit);
};

2
addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf
View File

@ -54,7 +54,7 @@ GVAR(serverSideValues) = [];
} forEach EGVAR(common,settings);
//Delay a frame
[{ [MENU_TAB_SERVER_OPTIONS] call FUNC(onServerListBoxShowSelectionChanged) }, []] call EFUNC(common,execNextFrame);
[{ [MENU_TAB_SERVER_OPTIONS] call FUNC(onServerListBoxShowSelectionChanged) }, []] call CBA_fnc_execNextFrame;
disableSerialization;
_menu = uiNamespace getVariable "ACE_serverSettingsMenu";

2
addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf
View File

@ -43,7 +43,7 @@ private _clientSettableCategories = [""];
} forEach EGVAR(common,settings);
//Delay a frame
[{ [MENU_TAB_OPTIONS] call FUNC(onListBoxShowSelectionChanged) }, []] call EFUNC(common,execNextFrame);
[{ [MENU_TAB_OPTIONS] call FUNC(onListBoxShowSelectionChanged) }, []] call CBA_fnc_execNextFrame;
disableSerialization;
_menu = uiNamespace getVariable "ACE_settingsMenu";

2
addons/overheating/functions/fnc_checkTemperature.sqf
View File

@ -31,4 +31,4 @@ if (_assistant isEqualTo _gunner) then {
_assistant playActionNow _action;
// Waits a sec before displaying the temperature
[FUNC(displayTemperature), [_gunner, _weapon], 1.0] call EFUNC(common,waitAndExecute);
[FUNC(displayTemperature), [_gunner, _weapon], 1.0] call CBA_fnc_waitAndExecute;

4
addons/overheating/functions/fnc_clearJam.sqf
View File

@ -55,14 +55,14 @@ if (_weapon in _jammedWeapons) then {
if (GVAR(DisplayTextOnJam)) then {
[{
[localize LSTRING(WeaponUnjammed)] call EFUNC(common,displayTextStructured);
}, [], _delay] call EFUNC(common,waitAndExecute);
}, [], _delay] call CBA_fnc_waitAndExecute;
};
} else {
// Failure
if (GVAR(DisplayTextOnJam)) then {
[{
[localize LSTRING(WeaponUnjamFailed)] call EFUNC(common,displayTextStructured);
}, [], _delay] call EFUNC(common,waitAndExecute);
}, [], _delay] call CBA_fnc_waitAndExecute;
};
};
};

2
addons/overheating/functions/fnc_jamWeapon.sqf
View File

@ -37,7 +37,7 @@ if (_ammo > 0) then {
[{
params ["_unit", "_weapon", "_ammo"];
_unit setAmmo [_weapon, _ammo];
}, [_unit, _weapon, _ammo]] call EFUNC(common,execNextFrame);
}, [_unit, _weapon, _ammo]] call CBA_fnc_execNextFrame;
};
// only display the hint once, after you try to shoot an already jammed weapon

2
addons/overheating/functions/fnc_updateSpareBarrelsTemperaturesThread.sqf
View File

@ -37,4 +37,4 @@ TRACE_1("updateSpareBarrelsTemperaturesThread2",_pairs);
} forEach _pairs;
// Schedule for execution again after 10 seconds
[DFUNC(updateSpareBarrelsTemperaturesThread), [], 10] call EFUNC(common,waitAndExecute);
[DFUNC(updateSpareBarrelsTemperaturesThread), [], 10] call CBA_fnc_waitAndExecute;

2
addons/overheating/functions/fnc_updateTemperatureThread.sqf
View File

@ -22,4 +22,4 @@ if ((_currentWeapon != "") && {_currentWeapon == primaryWeapon ACE_player || {_c
};
// Schedule for execution again after 5 seconds
[DFUNC(updateTemperatureThread), [], 5] call EFUNC(common,waitAndExecute);
[DFUNC(updateTemperatureThread), [], 5] call CBA_fnc_waitAndExecute;

2
addons/refuel/functions/fnc_connectNozzle.sqf
View File

@ -28,7 +28,7 @@ if (isNull _nozzle) exitWith {};
GVAR(placeAction) = PLACE_WAITING;
[{[localize LSTRING(Connect_Action), ""] call EFUNC(interaction,showMouseHint)}, []] call EFUNC(common,execNextFrame);
[{[localize LSTRING(Connect_Action), ""] call EFUNC(interaction,showMouseHint)}, []] call CBA_fnc_execNextFrame;
_unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = PLACE_APPROVE;}] call EFUNC(common,AddActionEventHandler)];
private _actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(Cancel)], {GVAR(placeAction) = PLACE_CANCEL;}];

2
addons/reload/functions/fnc_checkAmmo.sqf
View File

@ -34,4 +34,4 @@ if (_unit == _target) then {
_unit playActionNow "Gear";
};
[FUNC(displayAmmo), [_target], 1, 0.1] call EFUNC(common,waitAndExecute);
[FUNC(displayAmmo), [_target], 1, 0.1] call CBA_fnc_waitAndExecute;

2
addons/respawn/XEH_serverPostInit.sqf
View File

@ -10,7 +10,7 @@
deleteVehicle _unit;
};
},
_this, 4] call EFUNC(common,waitAndExecute);
_this, 4] call CBA_fnc_waitAndExecute;
false
}];
};

2
addons/respawn/functions/fnc_initRallypoint.sqf
View File

@ -45,7 +45,7 @@ if (hasInterface) then {
_marker setMarkerTextLocal _date;
_rallypoint setVariable [QGVAR(marker), _marker];
}, [_rallypoint, _respawnMarker, _side, _name], 0.1] call EFUNC(common,waitAndExecute);
}, [_rallypoint, _respawnMarker, _side, _name], 0.1] call CBA_fnc_waitAndExecute;
};
if (!isServer) exitWith {};

2
addons/respawn/functions/fnc_moduleFriendlyFire.sqf
View File

@ -27,7 +27,7 @@ if (isServer) then {
missionNamespace setVariable [QGVAR(showFriendlyFireMessage), true];
publicVariable QGVAR(showFriendlyFireMessage);
},
[], 0.1] call EFUNC(common,waitAndExecute);
[], 0.1] call CBA_fnc_waitAndExecute;
};
ACE_LOGINFO("Friendly Fire Messages Module Initialized.");

2
addons/respawn/functions/fnc_moveRallypoint.sqf
View File

@ -51,4 +51,4 @@ _position set [2, 0];
["rallypointMoved", [_rallypoint, _side, _position]] call EFUNC(common,globalEvent);
[localize LSTRING(Deployed)] call EFUNC(common,displayTextStructured);
}, [_rallypoint, _unit, _position], 5] call EFUNC(common,waitAndExecute);
}, [_rallypoint, _unit, _position], 5] call CBA_fnc_waitAndExecute;

2
addons/sandbag/CfgVehicles.hpp
View File

@ -9,7 +9,7 @@ class CfgVehicles {
displayName = CSTRING(DeploySandbag);
condition = QUOTE(_this call FUNC(canDeploy));
//wait a frame to handle "Do When releasing action menu key" option
statement = QUOTE([ARR_2({_this call FUNC(deploy)},_this)] call EFUNC(common,execNextFrame));
statement = QUOTE([ARR_2({_this call FUNC(deploy)},_this)] call CBA_fnc_execNextFrame);
exceptions[] = {"isNotSwimming"};
showDisabled = 0;
priority = 4;

2
addons/sandbag/functions/fnc_deployConfirm.sqf
View File

@ -41,7 +41,7 @@ _unit removeItem "ACE_Sandbag_empty";
_sandBag setDir _direction;
GVAR(sandBag) = objNull;
}, [_unit], 1] call EFUNC(common,waitAndExecute);
}, [_unit], 1] call CBA_fnc_waitAndExecute;
// remove deployment pfh
[GVAR(deployPFH)] call CBA_fnc_removePerFrameHandler;

2
addons/sandbag/functions/fnc_pickup.sqf
View File

@ -37,4 +37,4 @@ _unit setVariable [QGVAR(isUsingSandbag), true];
} count (_unit nearObjects ["ACE_SandbagObject", 5]);
[_unit, "ACE_Sandbag_empty"] call EFUNC(common,addToInventory);
}, [_unit, _sandbag], 1.5] call EFUNC(common,waitAndExecute);
}, [_unit, _sandbag], 1.5] call CBA_fnc_waitAndExecute;

2
addons/slideshow/functions/fnc_autoTransition.sqf
View File

@ -37,4 +37,4 @@ missionNamespace setVariable [_varString, _currentSlide];
// Log current slide and execute Next slide
TRACE_4("Auto-transition",_images select _currentSlide,_currentSlide,count _images,_duration);
[FUNC(autoTransition), [_objects, _images, _varString, _duration], _duration] call EFUNC(common,waitAndExecute);
[FUNC(autoTransition), [_objects, _images, _varString, _duration], _duration] call CBA_fnc_waitAndExecute;

2
addons/slideshow/functions/fnc_createSlideshow.sqf
View File

@ -80,5 +80,5 @@ if (_duration == 0) then {
missionNamespace setVariable [_varString, 0];
// Automatic transitions handler
[FUNC(autoTransition), [_objects, _images, _varString, _duration], _duration] call EFUNC(common,waitAndExecute);
[FUNC(autoTransition), [_objects, _images, _varString, _duration], _duration] call CBA_fnc_waitAndExecute;
};

4
addons/spectator/functions/fnc_handleInterface.sqf
View File

@ -111,7 +111,7 @@ switch (toLower _mode) do {
_timer ctrlCommit 0;
_frame ctrlCommit 0;
};
},[],0.5] call EFUNC(common,waitAndExecute);
},[],0.5] call CBA_fnc_waitAndExecute;
};
case "onunload": {
// Kill GUI PFHs
@ -490,7 +490,7 @@ switch (toLower _mode) do {
[_this select 1] call CBA_fnc_removePerFrameHandler;
},0] call CBA_fnc_addPerFrameHandler;
},[],5] call EFUNC(common,waitAndExecute);
},[],5] call CBA_fnc_waitAndExecute;
true
};

2
addons/spectator/functions/fnc_handleUnits.sqf
View File

@ -36,5 +36,5 @@ if !(GVAR(camUnit) in GVAR(unitList)) then {
// Reduce overhead when unit tree is hidden
if (ctrlShown (_display displayCtrl IDC_UNIT)) then {
// Reduce overhead by spreading across frames
[FUNC(handleInterface),["onUnitsUpdate",[(_display displayCtrl IDC_UNIT) controlsGroupCtrl IDC_UNIT_TREE]],1] call EFUNC(common,waitAndExecute);
[FUNC(handleInterface),["onUnitsUpdate",[(_display displayCtrl IDC_UNIT) controlsGroupCtrl IDC_UNIT_TREE]],1] call CBA_fnc_waitAndExecute;
};

2
addons/spectator/functions/fnc_setSpectator.sqf
View File

@ -97,7 +97,7 @@ if (_set) then {
};
}];
};
}, !_force] call EFUNC(common,execNextFrame);
}, !_force] call CBA_fnc_execNextFrame;
// Cache and disable nametag settings
if (["ace_nametags"] call EFUNC(common,isModLoaded)) then {

2
addons/spectator/functions/fnc_stageSpectator.sqf
View File

@ -73,6 +73,6 @@ if ((player in GVAR(unitList)) || {ACE_player in GVAR(unitList)}) then {
if (!(isNull (findDisplay 12249))) then {//If display is open now, close it and restart
ACE_LOGWARNING("Player in unitList, call ace_spectator_fnc_stageSpectator before ace_spectator_fnc_setSpectator");
["fixWeirdList", true] call FUNC(interrupt);
[{["fixWeirdList", false] call FUNC(interrupt);}, []] call EFUNC(common,execNextFrame);
[{["fixWeirdList", false] call FUNC(interrupt);}, []] call CBA_fnc_execNextFrame;
};
};

2
addons/spottingscope/functions/fnc_pickup.sqf
View File

@ -27,4 +27,4 @@ if ((_unit call CBA_fnc_getUnitAnim) select 0 == "stand") then {
[_unit, "ACE_SpottingScope"] call EFUNC(common,addToInventory);
deleteVehicle _spottingScope;
}, [_spottingScope, _unit], 1, 0]call EFUNC(common,waitAndExecute);
}, [_spottingScope, _unit], 1, 0]call CBA_fnc_waitAndExecute;

2
addons/spottingscope/functions/fnc_place.sqf
View File

@ -38,4 +38,4 @@ if ((_unit call CBA_fnc_getUnitAnim) select 0 == "stand") then {
_spottingScope setVectorUp (surfaceNormal (position _spottingScope));
};
_unit reveal _spottingScope;
}, [_unit], 1, 0] call EFUNC(common,waitAndExecute);
}, [_unit], 1, 0] call CBA_fnc_waitAndExecute;

2
addons/tacticalladder/CfgVehicles.hpp
View File

@ -92,7 +92,7 @@ class CfgVehicles {
distance = 4;
condition = "true";
//wait a frame to handle "Do When releasing action menu key" option:
statement = QUOTE([ARR_2({_this call FUNC(positionTL)},[ARR_2(_player,_target)])] call EFUNC(common,execNextFrame));
statement = QUOTE([ARR_2({_this call FUNC(positionTL)},[ARR_2(_player,_target)])] call CBA_fnc_execNextFrame);
showDisabled = 0;
exceptions[] = {};
priority = 5;

2
addons/tagging/functions/fnc_tag.sqf
View File

@ -110,6 +110,6 @@ _unit playActionNow "PutDown";
// Tell the server to create the tag and handle its destruction
["createTag", _this] call EFUNC(common,serverEvent);
}, [_touchingPoint vectorAdd (_surfaceNormal vectorMultiply 0.06), _vectorDirAndUp, _texture, _object, _unit], 0.6] call EFUNC(common,waitAndExecute);
}, [_touchingPoint vectorAdd (_surfaceNormal vectorMultiply 0.06), _vectorDirAndUp, _texture, _object, _unit], 0.6] call CBA_fnc_waitAndExecute;
true

2
addons/tagging/functions/fnc_tagTestingThread.sqf
View File

@ -41,5 +41,5 @@ if (GVAR(tagsToTest) isEqualTo []) exitWith {
};
// Schedule for execution again after 5 seconds
[DFUNC(tagTestingThread), [], 5] call EFUNC(common,waitAndExecute);
[DFUNC(tagTestingThread), [], 5] call CBA_fnc_waitAndExecute;
GVAR(testingThread) = true;

4
addons/trenches/CfgVehicles.hpp
View File

@ -30,7 +30,7 @@ class CfgVehicles {
displayName = CSTRING(DigEnvelopeSmall);
condition = QUOTE(_player call FUNC(canDigTrench));
//wait a frame to handle "Do When releasing action menu key" option
statement = QUOTE([ARR_2({_this call FUNC(placeTrench)},[ARR_2(_this select 0,'ACE_envelope_small')])] call EFUNC(common,execNextFrame));
statement = QUOTE([ARR_2({_this call FUNC(placeTrench)},[ARR_2(_this select 0,'ACE_envelope_small')])] call CBA_fnc_execNextFrame);
exceptions[] = {};
showDisabled = 0;
priority = 4;
@ -40,7 +40,7 @@ class CfgVehicles {
displayName = CSTRING(DigEnvelopeBig);
condition = QUOTE(_player call FUNC(canDigTrench));
//wait a frame to handle "Do When releasing action menu key" option
statement = QUOTE([ARR_2({_this call FUNC(placeTrench)},[ARR_2(_this select 0,'ACE_envelope_big')])] call EFUNC(common,execNextFrame));
statement = QUOTE([ARR_2({_this call FUNC(placeTrench)},[ARR_2(_this select 0,'ACE_envelope_big')])] call CBA_fnc_execNextFrame);
exceptions[] = {};
showDisabled = 0;
priority = 4;

2
addons/trenches/functions/fnc_continueDiggingTrench.sqf
View File

@ -84,7 +84,7 @@ for "_i" from _progressLeft to 10 do {
private _vectorDiffZ = 1 - (_i / 10);
private _delay = _digTime * ((_i / 10) - _actualProgress);
private _progress = _i / 10;
[DFUNC(setTrenchPlacement), [_unit, _trench, _trenchId, _basePos vectorDiff [0, 0, _vectorDiffZ], _vecDirAndUp, _progress], _delay] call EFUNC(common,waitAndExecute);
[DFUNC(setTrenchPlacement), [_unit, _trench, _trenchId, _basePos vectorDiff [0, 0, _vectorDiffZ], _vecDirAndUp, _progress], _delay] call CBA_fnc_waitAndExecute;
};
// Play animation

2
addons/trenches/functions/fnc_removeTrench.sqf
View File

@ -70,7 +70,7 @@ for "_i" from _progressLeft to 10 do {
private _delay = _removeTime * ((_i / 10) - (1 - _actualProgress));
private _progress = 1 - (_i / 10);
[DFUNC(setTrenchPlacement), [_unit, _trench, _trenchId, _basePos vectorDiff [0, 0, _vectorDiffZ], _vecDirAndUp, _progress], _delay] call EFUNC(common,waitAndExecute);
[DFUNC(setTrenchPlacement), [_unit, _trench, _trenchId, _basePos vectorDiff [0, 0, _vectorDiffZ], _vecDirAndUp, _progress], _delay] call CBA_fnc_waitAndExecute;
};
// Play animation

Some files were not shown because too many files have changed in this diff Show More