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

remove ccp issue in settings

Browse Source 
prevent setCaptive if unit is wake up
This commit is contained in:
jokoho48 2016-01-06 18:01:24 +01:00
parent 6d49bbda28
commit daf2fc2669
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/medical/ACE_Settings.hpp
View File

@ -228,6 +228,5 @@ class ACE_Settings {
displayName = CSTRING(delayUnconCaptive);
typeName = "SCALAR";
value = 10;
values[] = {CSTRING(painEffect_Flash), CSTRING(painEffect_Chroma)};
};
};

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

@ -99,7 +99,10 @@ if (GVAR(delayUnconCaptive) == 0) then {
[_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus);
} else {
[{
[_this select 0, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus);
params ["_unit"];
if (_unit getVariable ["ACE_isUnconscious", false]) then {
[_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus);
};
},[_unit], GVAR(delayUnconCaptive)] call EFUNC(common,waitAndExecute);
};