From 65f0f56474897ef87a28fb7540a080a6c56d1dd5 Mon Sep 17 00:00:00 2001 From: ulteq Date: Wed, 14 Dec 2016 21:30:28 +0100 Subject: [PATCH] Implemented 'showPainInMenu' --- .../fnc_displayPatientInformation.sqf | 20 ++++++++++--------- .../functions/fnc_updateUIInfo.sqf | 20 ++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/addons/medical/functions/fnc_displayPatientInformation.sqf b/addons/medical/functions/fnc_displayPatientInformation.sqf index 67f3d78b3a..dafef28fc4 100644 --- a/addons/medical/functions/fnc_displayPatientInformation.sqf +++ b/addons/medical/functions/fnc_displayPatientInformation.sqf @@ -60,17 +60,19 @@ if (_show == 1) then { if (((_target getVariable [QEGVAR(medical,tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then { _genericMessages pushback [localize ELSTRING(medical,Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]]; }; - private _painLevel = _target call EFUNC(medical,getPainLevel); - if (_painLevel > 0) then { - private _painText = localize ELSTRING(medical,Status_Pain); - if (_painLevel < 0.1) then { - _painText = localize ELSTRING(medical,Status_MildPain); - } else { - if (_painLevel > 0.5) then { - _painText = localize ELSTRING(medical,Status_SeverePain); + if ([ACE_player, EGVAR(medical,showPainInMenu)] call EFUNC(medical,isMedic)) then { + private _painLevel = _target call EFUNC(medical,getPainLevel); + if (_painLevel > 0) then { + private _painText = localize ELSTRING(medical,Status_Pain); + if (_painLevel < 0.1) then { + _painText = localize ELSTRING(medical,Status_MildPain); + } else { + if (_painLevel > 0.5) then { + _painText = localize ELSTRING(medical,Status_SeverePain); + }; }; + _genericMessages pushback [_painText, [1, 1, 1, 1]]; }; - _genericMessages pushback [_painText, [1, 1, 1, 1]]; }; private _totalIvVolume = 0; diff --git a/addons/medical_menu/functions/fnc_updateUIInfo.sqf b/addons/medical_menu/functions/fnc_updateUIInfo.sqf index 383c229f33..b088fa2155 100644 --- a/addons/medical_menu/functions/fnc_updateUIInfo.sqf +++ b/addons/medical_menu/functions/fnc_updateUIInfo.sqf @@ -39,17 +39,19 @@ if (((_target getVariable [QEGVAR(medical,tourniquets), [0, 0, 0, 0, 0, 0]]) sel _genericMessages pushBack [localize ELSTRING(medical,Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]]; }; -private _painLevel = _target call EFUNC(medical,getPainLevel); -if (_painLevel > 0) then { - private _painText = localize ELSTRING(medical,Status_Pain); - if (_painLevel < 0.1) then { - _painText = localize ELSTRING(medical,Status_MildPain); - } else { - if (_painLevel > 0.5) then { - _painText = localize ELSTRING(medical,Status_SeverePain); +if ([ACE_player, EGVAR(medical,showPainInMenu)] call EFUNC(medical,isMedic)) then { + private _painLevel = _target call EFUNC(medical,getPainLevel); + if (_painLevel > 0) then { + private _painText = localize ELSTRING(medical,Status_Pain); + if (_painLevel < 0.1) then { + _painText = localize ELSTRING(medical,Status_MildPain); + } else { + if (_painLevel > 0.5) then { + _painText = localize ELSTRING(medical,Status_SeverePain); + }; }; + _genericMessages pushback [_painText, [1, 1, 1, 1]]; }; - _genericMessages pushback [_painText, [1, 1, 1, 1]]; }; private _totalIvVolume = 0;