Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2268 from gienkov/pulse-enhancement

Browse Source 
HR and BP enhancement
This commit is contained in:
Glowbal
2015-08-29 11:47:00 +02:00
parent 70c0edf436 6a123020d2
commit 354e4410d1
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
addons/medical/functions/fnc_actionCheckBloodPressure.sqf
View File

@ -14,7 +14,8 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_caller","_target"]; private ["_caller","_target","_selectionName"];
_caller = _this select 0; _caller = _this select 0;
_target = _this select 1; _target = _this select 1;
[[_caller, _target], QUOTE(DFUNC(actionCheckBloodPressureLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ _selectionName = _this select 2;
[[_caller, _target, _selectionName], QUOTE(DFUNC(actionCheckBloodPressureLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */

8
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
View File

@ -14,9 +14,10 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_caller","_target","_bloodPressure","_bloodPressureHigh","_bloodPressureLow", "_logOutPut", "_output"]; private ["_caller","_target","_selectionName","_bloodPressure","_bloodPressureHigh","_bloodPressureLow", "_logOutPut", "_output"];
_caller = _this select 0; _caller = _this select 0;
_target = _this select 1; _target = _this select 1;
_selectionName = _this select 2;
_bloodPressure = [_target] call FUNC(getBloodPressure); _bloodPressure = [_target] call FUNC(getBloodPressure);
if (!alive _target) then { if (!alive _target) then {
@ -54,6 +55,11 @@ if ([_caller] call FUNC(isMedic)) then {
}; };
}; };
if (_selectionName in ["hand_l","hand_r"] && {[_unit, _selectionName] call FUNC(hasTourniquetAppliedTo)}) then {
_output = LSTRING(Check_Bloodpressure_Output_6);
_logOutPut = "";
};
["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent); ["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then { if (_logOutPut != "") then {

5
addons/medical/functions/fnc_actionCheckPulse.sqf
View File

@ -14,7 +14,8 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_caller","_target"]; private ["_caller","_target","_selectionName"];
_caller = _this select 0; _caller = _this select 0;
_target = _this select 1; _target = _this select 1;
[[_caller, _target], QUOTE(DFUNC(actionCheckPulseLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ _selectionName = _this select 2;
[[_caller, _target, _selectionName], QUOTE(DFUNC(actionCheckPulseLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */

9
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
View File

@ -14,10 +14,10 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_caller", "_unit", "_heartRateOutput", "_heartRate", "_logOutPut"]; private ["_caller", "_unit", "_selectionName", "_heartRateOutput", "_heartRate", "_logOutPut"];
_caller = _this select 0; _caller = _this select 0;
_unit = _this select 1; _unit = _this select 1;
_selectionName = _this select 2;
_heartRate = _unit getvariable [QGVAR(heartRate), 80]; _heartRate = _unit getvariable [QGVAR(heartRate), 80];
if (!alive _unit) then { if (!alive _unit) then {
@ -46,6 +46,11 @@ if (_heartRate > 1.0) then {
}; };
}; };
if (_selectionName in ["hand_l","hand_r"] && {[_unit, _selectionName] call FUNC(hasTourniquetAppliedTo)}) then {
_heartRateOutput = LSTRING(Check_Pulse_Output_5);
_logOutPut = LSTRING(Check_Pulse_None);
};
["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent); ["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then { if (_logOutPut != "") then {