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

Merge pull request #4008 from acemod/cleanupWaitAndExec

Browse Source 
Switch EFUNC(common,waitAndExecute) to CBA
This commit is contained in:
Glowbal 2016-06-27 19:03:24 +02:00 committed by GitHub
commit 0844e311a5
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/medical/functions/fnc_showBloodEffect.sqf
View File

@ -72,7 +72,7 @@ if (_bloodRemaining < 25) exitWith {
[{
(_this select 0) ctrlSetFade 1;
(_this select 0) ctrlCommit 0.8;
}, _fxBloodControls, 0.7] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 0.7] call CBA_fnc_waitAndExecute;
};
if (_bloodRemaining < 40) exitWith {
@ -85,11 +85,11 @@ if (_bloodRemaining < 40) exitWith {
(_this select 0) ctrlSetFade 1;
(_this select 1) ctrlSetFade 1;
(_this select 1) ctrlCommit 1;
}, _fxBloodControls, 0.7] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 0.7] call CBA_fnc_waitAndExecute;
[{
(_this select 0) ctrlCommit 0.8;
}, _fxBloodControls, 1.2] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 1.2] call CBA_fnc_waitAndExecute;
};
if (_bloodRemaining < 55) exitWith {
@ -103,11 +103,11 @@ if (_bloodRemaining < 55) exitWith {
(_this select 1) ctrlSetFade 1;
(_this select 2) ctrlSetFade 1;
(_this select 1) ctrlCommit 1;
}, _fxBloodControls, 0.7] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 0.7] call CBA_fnc_waitAndExecute;
[{
(_this select 0) ctrlCommit 0.8;
}, _fxBloodControls, 1.2] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 1.2] call CBA_fnc_waitAndExecute;
};
if (_bloodRemaining < 70) exitWith {
@ -123,15 +123,15 @@ if (_bloodRemaining < 70) exitWith {
(_this select 1) ctrlSetFade 1;
(_this select 2) ctrlSetFade 1;
(_this select 2) ctrlCommit 1.5;
}, _fxBloodControls, 0.7] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 0.7] call CBA_fnc_waitAndExecute;
[{
(_this select 1) ctrlCommit 1;
}, _fxBloodControls, 1.7] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 1.7] call CBA_fnc_waitAndExecute;
[{
(_this select 0) ctrlCommit 0.8;
}, _fxBloodControls, 2.2] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 2.2] call CBA_fnc_waitAndExecute;
};
//default
@ -147,12 +147,12 @@ _bloodCtrl3 ctrlCommit 0.2;
(_this select 1) ctrlSetFade 1;
(_this select 2) ctrlSetFade 1;
(_this select 2) ctrlCommit 1.5;
}, _fxBloodControls, 0.7] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 0.7] call CBA_fnc_waitAndExecute;
[{
(_this select 1) ctrlCommit 1;
}, _fxBloodControls, 1.7] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 1.7] call CBA_fnc_waitAndExecute;
[{
(_this select 0) ctrlCommit 0.8;
}, _fxBloodControls, 2.2] call EFUNC(common,waitAndExecute);
}, _fxBloodControls, 2.2] call CBA_fnc_waitAndExecute;