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

Fixed examine actions

Browse Source
This commit is contained in:
Thomas Kooi 2015-01-19 00:58:17 +01:00
parent a890400c55
commit 76e877067c
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/medical/functions/fnc_ActionCheckBloodPressureLocal.sqf
View File

@ -23,7 +23,7 @@ _bloodPressureHigh = _bloodPressure select 1;
_bloodPressureLow = _bloodPressure select 0;
_output = "";
_logOutPut = "";
if ([_caller] call FUNC(medicClass)) then {
if ([_caller] call FUNC(isMedic)) then {
_output = "STR_ACE_CHECK_BLOODPRESSURE_OUTPUT_1";
_logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)];
} else {

4
addons/medical/functions/fnc_ActionCheckPulse.sqf
View File

@ -28,7 +28,7 @@ _caller setvariable [QGVAR(StartingPositionHandleTreatment), getPos _caller];
private ["_caller","_target"];
_caller = _this select 0;
_target = _this select 1;
[_this, QUOTE(FUNC(actionCheckPulseLocal)), _target] call EFUNC(common,execRemoteFnc);
[[_caller, _target], QUOTE(FUNC(actionCheckPulseLocal)), _target] call EFUNC(common,execRemoteFnc);
[_caller,false] call FUNC(treatmentMutex);
}, // on success
{
@ -37,3 +37,5 @@ _caller setvariable [QGVAR(StartingPositionHandleTreatment), getPos _caller];
}, // on failure
[_caller, _target] // arguments
] call EFUNC(gui,loadingBar);
systemChat format["actionCheckPulse: %1", _this];

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

@ -10,18 +10,21 @@
#include "script_component.hpp"
private ["_caller","_unit"];
private ["_caller","_unit", "_heartRateOutput", "_heartRate","_logOutPut", "_title","_content"];
_caller = _this select 0;
_unit = _this select 1;
systemChat format["called check pulse: %1", _this];
_heartRate = [_unit,QGVAR(heartRate)] call EFUNC(common,getDefinedVariable);
if (!alive _unit) then {
_heartRate = 0;
};
_heartRateOutput = "";
_logOutPut = "";
_heartRateOutput = "STR_ACE_CHECK_PULSE_OUTPUT_5";
_logOutPut = "No heart rate";
if (_heartRate > 1.0) then {
if ([_caller] call FUNC(medicClass)) then {
if ([_caller] call FUNC(isMedic)) then {
_heartRateOutput = "STR_ACE_CHECK_PULSE_OUTPUT_1";
_logOutPut = format["%1",round(_heartRate)];
} else {
@ -38,15 +41,15 @@ if (_heartRate > 1.0) then {
};
};
};
} else {
_heartRateOutput = "STR_ACE_CHECK_PULSE_OUTPUT_5";
_logOutPut = "No heart rate";
};
_title = "STR_ACE_CHECK_PULSE";
_content = ["STR_ACE_CHECK_PULSE_CHECKED_MEDIC",_heartRateOutput];
[_caller, _title, _content,0, [[_unit] call EFUNC(common,getName), round(_heartRate)]] call EFUNC(gui,sendDisplayInformationTo);
[_caller, _title, _content, 0, [[_unit] call EFUNC(common,getName), round(_heartRate)]] call EFUNC(gui,sendDisplayInformationTo);
if (_logOutPut != "") then {
[_unit,"examine",format["%1 checked Heart Rate: %2",[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToQuickViewLog);
};
systemChat format["completed check pulse: %1 %2 %3 %4", _this, _logOutPut, _title, _content];
diag_log format["completed check pulse: %1 %2 %3 %4", _this, _logOutPut, _title, _content];

10
addons/medical/functions/fnc_actionCheckResponse.sqf
View File

@ -30,16 +30,16 @@ _caller setvariable [QGVAR(StartingPositionHandleTreatment), getPos _caller];
_target = _this select 1;
_output = "";
if ([_unit] call EFUNC(common,isAwake)) then {
_output = format[localize "STR_ACE_CHECK_REPONSE_RESPONSIVE",[_unit] call EFUNC(common,getName)];
if ([_target] call EFUNC(common,isAwake)) then {
_output = format[localize "STR_ACE_CHECK_REPONSE_RESPONSIVE",[_target] call EFUNC(common,getName)];
} else {
_output = format[localize "STR_ACE_CHECK_REPONSE_UNRESPONSIVE",[_unit] call EFUNC(common,getName)];
_output = format[localize "STR_ACE_CHECK_REPONSE_UNRESPONSIVE",[_target] call EFUNC(common,getName)];
};
_title = format["STR_ACE_CHECK_RESPONSE"];
_content = [format[localize "STR_ACE_CHECK_REPONSE_YOU_CHECKED",[_unit] call EFUNC(common,getName)],_output];
_content = [format[localize "STR_ACE_CHECK_REPONSE_YOU_CHECKED",[_target] call EFUNC(common,getName)],_output];
[_caller, _title, _content] call EFUNC(gui,sendDisplayInformationTo);
[_unit,"examine",_output] call FUNC(addToQuickViewLog);
[_target,"examine",_output] call FUNC(addToQuickViewLog);
[_caller,false] call FUNC(treatmentMutex);
}, // on success