Merge pull request #4258 from acemod/reviveTimer

Clear reviveState when calling setUnconscious
This commit is contained in:
Glowbal 2016-08-20 11:57:51 +02:00 committed by GitHub
commit 83e78f1021
2 changed files with 3 additions and 4 deletions

View File

@ -34,6 +34,9 @@ if (_set isEqualTo (_unit getVariable ["ACE_isUnconscious", false])) exitWith {}
if !(_set) exitWith {
_unit setVariable ["ACE_isUnconscious", false, true];
if (_unit getVariable [QGVAR(inReviveState), false]) then {
_unit setVariable [QGVAR(inReviveState), nil, true];
};
};
if !(!(isNull _unit) && {(_unit isKindOf "CAManBase") && ([_unit] call EFUNC(common,isAwake))}) exitWith{};

View File

@ -18,7 +18,3 @@
params ["_caller", "_target","_className"];
[_target, false] call FUNC(setUnconscious);
if (_target getVariable [QGVAR(inReviveState), false]) then {
_target setVariable [QGVAR(inReviveState), nil, true];
};