From 048be00a0f59d4265f3dc8c8d82d67df27c3b912 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 26 Mar 2015 15:47:08 -0500 Subject: [PATCH] Medical - QGVAR(isUnconscious) -> "ACE_isUnconscious" --- addons/medical/functions/fnc_handleDamage_basic.sqf | 2 +- addons/medical/functions/fnc_handleUnitVitals.sqf | 2 +- addons/medical/functions/fnc_init.sqf | 2 +- .../medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index 600101e7eb..5beacc16c2 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -181,7 +181,7 @@ if (_selection == "") then { if (_selection == "" and _damageReturn >= UNCONSCIOUSNESSTRESHOLD and _damageReturn < 1 and - !(_unit getVariable [QGVAR(isUnconscious), False] + !(_unit getVariable ["ACE_isUnconscious", False] )) then { if (_unit getVariable [QGVAR(allowUnconscious), ([_unit] call EFUNC(common,isPlayer)) or random 1 > 0.3]) then { [_unit, true] call FUNC(setUnconscious); diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf index fb085a19b7..992ccdc3f2 100644 --- a/addons/medical/functions/fnc_handleUnitVitals.sqf +++ b/addons/medical/functions/fnc_handleUnitVitals.sqf @@ -81,7 +81,7 @@ if (GVAR(level) == 1) then { _blood = (_blood - 0.4 * (damage _unit) * _interval) max 0; if (_blood != (_unit getVariable [QGVAR(bloodVolume), 100])) then { _unit setVariable [QGVAR(bloodVolume), _blood, _syncValues]; - if (_blood <= 35 and !(_unit getVariable [QGVAR(isUnconscious), false])) then { + if (_blood <= 35 and !(_unit getVariable ["ACE_isUnconscious", false])) then { [_unit, true] call FUNC(setUnconscious); }; if (_blood == 0) then { diff --git a/addons/medical/functions/fnc_init.sqf b/addons/medical/functions/fnc_init.sqf index dfd27cdd6f..0410e2a7ba 100644 --- a/addons/medical/functions/fnc_init.sqf +++ b/addons/medical/functions/fnc_init.sqf @@ -57,7 +57,7 @@ _unit setvariable [QGVAR(airwayCollapsed), false, true]; // generic medical admin _unit setvariable [QGVAR(addedToUnitLoop), false, true]; _unit setvariable [QGVAR(inCardiacArrest), false, true]; -_unit setVariable [QGVAR(isUnconscious), false, true]; +_unit setVariable ["ACE_isUnconscious", false, true]; _unit setvariable [QGVAR(hasLostBlood), false, true]; _unit setvariable [QGVAR(isBleeding), false, true]; _unit setvariable [QGVAR(hasPain), false, true]; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf index 5125a93bd0..afcc31367b 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf @@ -52,7 +52,7 @@ if (alive _unit) exitwith { // generic medical admin _unit setvariable [QGVAR(addedToUnitLoop), false, true]; _unit setvariable [QGVAR(inCardiacArrest), false, true]; - _unit setVariable [QGVAR(isUnconscious), false, true]; + _unit setVariable ["ACE_isUnconscious", false, true]; _unit setvariable [QGVAR(hasLostBlood), false, true]; _unit setvariable [QGVAR(isBleeding), false, true]; _unit setvariable [QGVAR(hasPain), false, true];