Merge pull request #1492 from GitHawk/master

Disabled pain effect while unconscious
This commit is contained in:
Glowbal 2015-06-04 21:45:48 +02:00
commit e103007ae7

View File

@ -164,7 +164,14 @@ GVAR(lastHeartBeatSound) = ACE_time;
if (_heartRate <= 0) exitwith {};
_interval = 60 / (_heartRate min 50);
if (ACE_time > GVAR(lastHeartBeat) + _interval) then {
if ((ACE_player getVariable ["ACE_isUnconscious", false])) then {
if (GVAR(painEffectType) == 1) then {
GVAR(effectPainCA) ppEffectEnable false;
} else {
GVAR(effectPainCC) ppEffectEnable false;
};
} else {
if ((ACE_time > GVAR(lastHeartBeat) + _interval)) then {
GVAR(lastHeartBeat) = ACE_time;
// Pain effect
@ -216,6 +223,7 @@ GVAR(lastHeartBeatSound) = ACE_time;
};
};
};
};
if (GVAR(level) >= 2 && {_heartRate > 0}) then {
_minTime = 60 / _heartRate;