Implemented status macro functions for feedback

This commit is contained in:
BaerMitUmlaut 2017-04-27 19:12:57 +02:00
parent 67f557de6a
commit 47621ac81a
2 changed files with 7 additions and 7 deletions

View File

@ -3,14 +3,14 @@
* Handles the hear beat sound. * Handles the hear beat sound.
* *
* Arguments: * Arguments:
* None * 0: Heart rate <NUMBER>
* *
* Return Value: * Return Value:
* None * None
*/ */
#include "script_component.hpp" #include "script_component.hpp"
params ["_heartRate"];
private _heartRate = ACE_player getVariable [QEGVAR(medical,heartRate), DEFAULT_HEART_RATE];
if (_heartRate == 0) exitWith { if (_heartRate == 0) exitWith {
TRACE_1("Ending heart beat effect - zero",_heartRate); TRACE_1("Ending heart beat effect - zero",_heartRate);
GVAR(heartBeatEffectRunning) = false; GVAR(heartBeatEffectRunning) = false;

View File

@ -21,11 +21,11 @@ if (EGVAR(common,OldIsCamera) || {!alive ACE_player}) exitWith {
BEGIN_COUNTER(handleEffects); BEGIN_COUNTER(handleEffects);
// - Current state info ------------------------------------------------------- // - Current state info -------------------------------------------------------
private _bleedingStrength = [ACE_player] call EFUNC(medical,getBloodloss); private _bleedingStrength = GET_BLOOD_LOSS(ACE_player);
private _bloodVolume = ACE_player getVariable [QEGVAR(medical,bloodVolume), DEFAULT_BLOOD_VOLUME]; private _bloodVolume = GET_BLOOD_VOLUME(ACE_player);
private _unconscious = ACE_player getVariable [QEGVAR(medical,isUnconscious), false]; private _unconscious = IS_UNCONSCIOUS(ACE_player);
private _heartRate = ACE_player getVariable [QEGVAR(medical,heartRate), DEFAULT_HEART_RATE]; private _heartRate = GET_HEART_RATE(ACE_player);
private _pain = [ACE_player] call EFUNC(medical,getPainLevel); private _pain = GET_PAIN_PERCEIVED(ACE_player);
if ((!GVAR(heartBeatEffectRunning)) && {_heartRate != 0} && {(_heartRate > 160) || {_heartRate < 60}}) then { if ((!GVAR(heartBeatEffectRunning)) && {_heartRate != 0} && {(_heartRate > 160) || {_heartRate < 60}}) then {
TRACE_1("Starting heart beat effect",_heartRate); TRACE_1("Starting heart beat effect",_heartRate);