From 89927a8b94c4b437aafc491a077a636756624e4e Mon Sep 17 00:00:00 2001 From: Magnetar Date: Sun, 17 Mar 2019 21:26:15 +0100 Subject: [PATCH] Missing privates. Lazy evaluation. --- addons/medical_ai/functions/fnc_isInjured.sqf | 2 +- .../medical_damage/functions/fnc_parseConfigForInjuries.sqf | 2 +- addons/medical_damage/functions/fnc_woundsHandlerSQF.sqf | 4 ++-- addons/medical_engine/functions/fnc_handleDamage.sqf | 2 +- addons/medical_gui/functions/fnc_updateIcons.sqf | 2 +- .../medical_treatment/functions/fnc_actionCheckPulseLocal.sqf | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/medical_ai/functions/fnc_isInjured.sqf b/addons/medical_ai/functions/fnc_isInjured.sqf index 7fe84e8c88..3fa5370641 100644 --- a/addons/medical_ai/functions/fnc_isInjured.sqf +++ b/addons/medical_ai/functions/fnc_isInjured.sqf @@ -17,7 +17,7 @@ if !(alive _this) exitWith {false}; -private _bloodLoss = GET_BLOOD_LOSS(_this); +private _bloodLoss = GET_BLOOD_LOSS(_this); private _pain = GET_PAIN_PERCEIVED(_this); private _unconscious = IS_UNCONSCIOUS(_this); diff --git a/addons/medical_damage/functions/fnc_parseConfigForInjuries.sqf b/addons/medical_damage/functions/fnc_parseConfigForInjuries.sqf index 830a83b802..1512af3139 100644 --- a/addons/medical_damage/functions/fnc_parseConfigForInjuries.sqf +++ b/addons/medical_damage/functions/fnc_parseConfigForInjuries.sqf @@ -33,7 +33,7 @@ private _classID = 0; private _causes = GET_ARRAY(_entry >> "causes",[]); private _causeLimping = GET_NUMBER(_entry >> "causeLimping",0); - if (count _causes > 0) then { + if !(_causes isEqualTo []) then { GVAR(woundClassNames) pushBack _className; GVAR(woundsData) pushBack [_classID, _selections, _bleeding, _pain, [_minDamage, _maxDamage], _causes, _className, _causeLimping]; _classID = _classID + 1; diff --git a/addons/medical_damage/functions/fnc_woundsHandlerSQF.sqf b/addons/medical_damage/functions/fnc_woundsHandlerSQF.sqf index 79566cc0de..52ced39d34 100644 --- a/addons/medical_damage/functions/fnc_woundsHandlerSQF.sqf +++ b/addons/medical_damage/functions/fnc_woundsHandlerSQF.sqf @@ -96,14 +96,14 @@ private _woundsCreated = []; _bodyPartVisParams set [[1,2,3,3,4,4] select _bodyPartNToAdd, true]; // Mark the body part index needs updating // Create a new injury. Format [ID, classID, bodypart, percentage treated, bleeding rate] - _injury = [_woundID, _woundClassIDToAdd, _bodyPartNToAdd, 1, _injuryBleedingRate]; + private _injury = [_woundID, _woundClassIDToAdd, _bodyPartNToAdd, 1, _injuryBleedingRate]; // The higher the nastiness likelihood the higher the change to get a painful and bloody wound private _nastinessLikelihood = linearConversion [0, 20, (_woundDamage / _thresholdWoundCount), 0.5, 30, true]; private _bleedingModifier = 0.25 + 8 * exp ((random [-4.5, -5, -6]) / _nastinessLikelihood); private _painModifier = 0.05 + 2 * exp (-2 / _nastinessLikelihood); - _bleeding = _injuryBleedingRate * _bleedingModifier; + private _bleeding = _injuryBleedingRate * _bleedingModifier; private _pain = _injuryPain * _painModifier; _painLevel = _painLevel + _pain; diff --git a/addons/medical_engine/functions/fnc_handleDamage.sqf b/addons/medical_engine/functions/fnc_handleDamage.sqf index 3cf65b6cc0..7dd6a1bfe4 100644 --- a/addons/medical_engine/functions/fnc_handleDamage.sqf +++ b/addons/medical_engine/functions/fnc_handleDamage.sqf @@ -32,7 +32,7 @@ if (_hitPoint isEqualTo "") then { }; // Damage can be disabled with old variable or via sqf command allowDamage -if !(isDamageAllowed _unit && _unit getVariable [QEGVAR(medical,allowDamage), true]) exitWith {_oldDamage}; +if !(isDamageAllowed _unit && {_unit getVariable [QEGVAR(medical,allowDamage), true]}) exitWith {_oldDamage}; // Damages are stored for "ace_hdbracket" event triggered last private _newDamage = _damage - _oldDamage; diff --git a/addons/medical_gui/functions/fnc_updateIcons.sqf b/addons/medical_gui/functions/fnc_updateIcons.sqf index 2d437612d7..60afbe762a 100644 --- a/addons/medical_gui/functions/fnc_updateIcons.sqf +++ b/addons/medical_gui/functions/fnc_updateIcons.sqf @@ -25,7 +25,7 @@ private _options = ["triage" , "examine", "bandage", "medication", "airway", "ad for "_idc" from START_IDC to END_IDC step 1 do { private _amount = [ACE_player, GVAR(INTERACTION_TARGET), _options select (_idc - START_IDC)] call FUNC(getTreatmentOptions); - if ((count _amount) > 0 || _idc == START_IDC || _idc == END_IDC) then { + if (!(_amount isEqualTo []) || {_idc == START_IDC} || {_idc == END_IDC}) then { (_display displayCtrl _idc) ctrlSettextColor [1, 1, 1, 1]; } else { (_display displayCtrl _idc) ctrlSettextColor [0.4, 0.4, 0.4, 1]; diff --git a/addons/medical_treatment/functions/fnc_actionCheckPulseLocal.sqf b/addons/medical_treatment/functions/fnc_actionCheckPulseLocal.sqf index ebb54209e5..585ba4c7d8 100644 --- a/addons/medical_treatment/functions/fnc_actionCheckPulseLocal.sqf +++ b/addons/medical_treatment/functions/fnc_actionCheckPulseLocal.sqf @@ -18,7 +18,7 @@ params ["_caller", "_target", "_bodyPart"]; private _heartRate = 0; -if (alive _target && !([_target, _bodyPart] call FUNC(hasTourniquetAppliedTo))) then { +if (alive _target && {!([_target, _bodyPart] call FUNC(hasTourniquetAppliedTo))}) then { _heartRate = GET_HEART_RATE(_target); };