Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General - Apply HEMTT suggestions #683

Open
wants to merge 8 commits into
base: dev-Tomcat
Choose a base branch
from
Open

General - Apply HEMTT suggestions #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fb5463c
changes
MiszczuZPolski Jan 1, 2025
4810143
Merge branch 'dev-Tomcat' into unneededNot
MiszczuZPolski Jan 2, 2025
916cdae
Update script_debug.hpp
MiszczuZPolski Jan 2, 2025
8e02a6f
Merge branch 'dev-Tomcat' into unneededNot
MiszczuZPolski Jan 2, 2025
608f67a
Merge branch 'dev-Tomcat' into unneededNot
MiszczuZPolski Jan 5, 2025
8f1e72c
Update XEH_postInit.sqf
MiszczuZPolski Jan 5, 2025
de9a616
Merge branch 'dev-Tomcat' into unneededNot
MiszczuZPolski Jan 15, 2025
0c8badc
update
MiszczuZPolski Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/airway/functions/fnc_gui_updateBodyImage.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ private _ctrlKingLT = _ctrlGroup controlsGroupCtrl IDC_BODY_HEAD_KINGLT;

private _airwayItem = _target getVariable [QGVAR(airway_item), ""];

if !(_airwayItem isEqualTo "") then {
if (_airwayItem isNotEqualTo "") then {
if (_airwayItem isEqualTo "Larynxtubus") then {
_ctrlGuedelTube ctrlShow false;
_ctrlKingLT ctrlShow true;
Expand Down
2 changes: 1 addition & 1 deletion addons/airway/functions/fnc_gui_updateInjuryListPart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (_target getVariable [QGVAR(overstretch), false] && _selectionN isEqualTo 0)

if (_target getVariable [QGVAR(airway), false] && _selectionN isEqualTo 0) then {
private _a = _target getVariable [QGVAR(airway_item), ""];
if !(_a isEqualTo "") then {
if (_a isNotEqualTo "") then {
private _text = format [LSTRING(%1_Display), _a];
_entries pushBack [localize _text, [0.1, 1, 1, 1]];
};
Expand Down
2 changes: 1 addition & 1 deletion addons/airway/functions/fnc_startHeadTurning.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ GVAR(headTurn_timeOut) = true;

private _patientCondition = (!(IS_UNCONSCIOUS(_patient)) && alive _patient || _patient isEqualTo objNull);
private _medicCondition = (!(alive _medic) || IS_UNCONSCIOUS(_medic) || _medic isEqualTo objNull);
private _vehicleCondition = !(objectParent _medic isEqualTo objectParent _patient);
private _vehicleCondition = (objectParent _medic isNotEqualTo objectParent _patient);
private _distanceCondition = (_patient distance2D _medic > ACEGVAR(medical_gui,maxDistance));

if (_patientCondition || _medicCondition || !(_patient getVariable [QGVAR(headTurningActive), false]) || dialog || {(!_notInVehicle && _vehicleCondition) || {(_notInVehicle && _distanceCondition)}}) exitWith {
Expand Down
3 changes: 1 addition & 2 deletions addons/breathing/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@
[QACEGVAR(medical_gui,updateInjuryListWounds), LINKFUNC(gui_updateInjuryListWounds)] call CBA_fnc_addEventHandler;
[QACEGVAR(medical_gui,updateBodyImage), LINKFUNC(gui_updateBodyImage)] call CBA_fnc_addEventHandler;
[QACEGVAR(medical_treatment,fullHealLocalMod), LINKFUNC(fullHealLocal)] call CBA_fnc_addEventHandler;
[QACEGVAR(medical,woundReceived),LINKFUNC(handlePulmoHit)] call CBA_fnc_addEventHandler;

private _items = missionNamespace getVariable [QGVAR(availOxyMask), "'G_AirPurifyingRespirator_01_F'"];
private _array = [_items, "CfgGlasses"] call EFUNC(chemical,getList);

missionNamespace setVariable [QGVAR(availOxyMaskList), _array, true];
missionNamespace setVariable [QGVAR(availOxyMaskList), _array, true];
4 changes: 2 additions & 2 deletions addons/breathing/functions/fnc_handleBreathing.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ if (!local _unit) then {
if (_finalOutput < 1) then {
_finalOutput = 1;
};

_unit setVariable [QGVAR(airwayStatus), _finalOutput, true];
};

Expand Down Expand Up @@ -215,7 +215,7 @@ if (!local _unit) then {

private _soundTargets = allPlayers inAreaArray [ASLToAGL getPosASL _unit, 15, 15, 0, false, 15];

if !(_soundTargets isEqualTo []) then {
if (_soundTargets isNotEqualTo []) then {
[QGVAR(playCough), [_unit], _soundTargets] call CBA_fnc_targetEvent;
};

Expand Down
2 changes: 1 addition & 1 deletion addons/breathing/functions/fnc_useBVM.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ GVAR(BVM_timeOut) = true;

private _patientCondition = (!(IS_UNCONSCIOUS(_patient)) && alive _patient || _patient isEqualTo objNull);
private _medicCondition = (!(alive _medic) || IS_UNCONSCIOUS(_medic) || _medic isEqualTo objNull);
private _vehicleCondition = !(objectParent _medic isEqualTo objectParent _patient);
private _vehicleCondition = (objectParent _medic isNotEqualTo objectParent _patient);
private _distanceCondition = (_patient distance2D _medic > ACEGVAR(medical_gui,maxDistance));

if (_patientCondition || _medicCondition || !(_patient getVariable [QGVAR(BVMInUse), false]) || dialog || {(!_notInVehicle && _vehicleCondition) || {(_notInVehicle && _distanceCondition)}}) exitWith {
Expand Down
12 changes: 6 additions & 6 deletions addons/circulation/functions/fnc_AEDX_ConnectVitalsMonitor.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ switch (_source) do {
[{ // Disconnect monitoring if patient gets too far
params ["_medic", "_patient", "_provider"];

(_patient distance _provider) > GVAR(Defibrillator_DistanceLimit) || !((objectParent _medic) isEqualTo (objectParent _patient));
(_patient distance _provider) > GVAR(Defibrillator_DistanceLimit) || ((objectParent _medic) isNotEqualTo (objectParent _patient));
}, {
params ["_medic", "_patient", "_provider"];

if !(_patient isEqualTo objNull) then {
if (_patient isNotEqualTo objNull) then {
if (_patient getVariable [QGVAR(AED_X_VitalsMonitor_Connected), false]) then {
[_medic, _patient] call FUNC(AEDX_DisconnectVitalsMonitor);
if !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) then {
Expand All @@ -76,11 +76,11 @@ switch (_source) do {
[{ // Disconnect monitoring if patient exits vehicle
params ["_medic", "_patient", "_provider"];

!((objectParent _patient) isEqualTo _provider);
((objectParent _patient) isNotEqualTo _provider);
}, {
params ["_medic", "_patient", "_provider"];

if !(_patient isEqualTo objNull) then {
if (_patient isNotEqualTo objNull) then {
[_medic, _patient] call FUNC(AEDX_DisconnectVitalsMonitor);

if ((objectParent _medic) isEqualTo _provider && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false])) then {
Expand All @@ -97,11 +97,11 @@ switch (_source) do {
[{ // Disconnect monitoring if patient gets too far
params ["_medic", "_patient"];

(_patient distance _medic) > GVAR(Defibrillator_DistanceLimit) || !((objectParent _medic) isEqualTo (objectParent _patient));
(_patient distance _medic) > GVAR(Defibrillator_DistanceLimit) || ((objectParent _medic) isNotEqualTo (objectParent _patient));
}, {
params ["_medic", "_patient"];

if !(_patient isEqualTo objNull) then {
if (_patient isNotEqualTo objNull) then {
if (_patient getVariable [QGVAR(AED_X_VitalsMonitor_Connected), false]) then {
[_medic, _patient] call FUNC(AEDX_DisconnectVitalsMonitor);
if !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) then {
Expand Down
10 changes: 5 additions & 5 deletions addons/circulation/functions/fnc_AEDX_ViewMonitor.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

private _pads = false;

if !(GVAR(AEDX_MonitorTarget) isEqualTo objNull) then {
if (GVAR(AEDX_MonitorTarget) isNotEqualTo objNull) then {
_pads = GVAR(AEDX_MonitorTarget) getVariable [QGVAR(DefibrillatorPads_Connected), false];
};

Expand All @@ -90,7 +90,7 @@
ctrlSetText [IDC_EKG_DISPLAY_MIDTEXT, ""];
private _ekgDisplay = QPATHTOF(ui\ekg_off.paa);

if !(GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,CPR_provider), objNull] isEqualTo objNull) then {
if (GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,CPR_provider), objNull] isNotEqualTo objNull) then {
_ekgDisplay = QPATHTOF(ui\ekg_cpr.paa);
} else {
if (!(GVAR(AEDX_MonitorTarget) getVariable [QGVAR(heartRestart), false]) && alive GVAR(AEDX_MonitorTarget)) then {
Expand Down Expand Up @@ -162,7 +162,7 @@

private _PRBar = _dlg displayCtrl IDC_DISPLAY_PULSERATEBAR;

if (!(HAS_TOURNIQUET_APPLIED_ON(GVAR(AEDX_MonitorTarget),_partIndex))) then {

Check notice on line 165 in addons/circulation/functions/fnc_AEDX_ViewMonitor.sqf

View workflow job for this annotation

GitHub Actions / windows

Unneeded Not 

unneeded not
if (GVAR(PulseRateReady)) then {
GVAR(PulseRateReady) = false;
private _pr = GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,heartRate), 0];
Expand Down Expand Up @@ -222,7 +222,7 @@
private _pads = false;
private _vitalsMonitor = false;

if !(GVAR(AEDX_MonitorTarget) isEqualTo objNull) then {
if (GVAR(AEDX_MonitorTarget) isNotEqualTo objNull) then {
_pads = GVAR(AEDX_MonitorTarget) getVariable [QGVAR(DefibrillatorPads_Connected), false];
_vitalsMonitor = GVAR(AEDX_MonitorTarget) getVariable [QGVAR(AED_X_VitalsMonitor_Connected), false];
};
Expand All @@ -244,7 +244,7 @@
ctrlSetText [IDC_DISPLAY_SPO2, "---"];
};

if !(GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,CPR_provider), objNull] isEqualTo objNull) then {
if (GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,CPR_provider), objNull] isNotEqualTo objNull) then {

private _rhythmHR = 0;

Expand Down Expand Up @@ -310,7 +310,7 @@
ctrlSetText [IDC_DISPLAY_SPO2, "---"];
};

private _hasEtco2Monitor = !(GVAR(AEDX_MonitorTarget) getVariable [QEGVAR(breathing,etco2Monitor),[]] isEqualTo []); //check for etco2 monitoring apparatus
private _hasEtco2Monitor = (GVAR(AEDX_MonitorTarget) getVariable [QEGVAR(breathing,etco2Monitor),[]] isNotEqualTo []); //check for etco2 monitoring apparatus
private _etco2 = GET_ETCO2(GVAR(AEDX_MonitorTarget));
private _breathrate = GET_BREATHING_RATE(GVAR(AEDX_MonitorTarget));

Expand Down
10 changes: 5 additions & 5 deletions addons/circulation/functions/fnc_AEDX_ViewMonitor_CPR.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

private _pads = false;

if !(GVAR(AEDX_MonitorTarget_Title) isEqualTo objNull) then {
if (GVAR(AEDX_MonitorTarget_Title) isNotEqualTo objNull) then {
_pads = GVAR(AEDX_MonitorTarget_Title) getVariable [QGVAR(DefibrillatorPads_Connected), false];
};

Expand All @@ -62,7 +62,7 @@
(_dlg displayCtrl IDC_EKG_DISPLAY_MIDTEXT_TITLE) ctrlSetText "";
private _ekgDisplay = QPATHTOF(ui\ekg_off.paa);

if !(GVAR(AEDX_MonitorTarget_Title) getVariable [QACEGVAR(medical,CPR_provider), objNull] isEqualTo objNull) then {
if (GVAR(AEDX_MonitorTarget_Title) getVariable [QACEGVAR(medical,CPR_provider), objNull] isNotEqualTo objNull) then {
_ekgDisplay = QPATHTOF(ui\ekg_cpr.paa);
} else {
if (!(GVAR(AEDX_MonitorTarget_Title) getVariable [QGVAR(heartRestart), false]) && alive GVAR(AEDX_MonitorTarget_Title)) then {
Expand Down Expand Up @@ -125,7 +125,7 @@

private _PRBar = _dlg displayCtrl IDC_DISPLAY_PULSERATEBAR_TITLE;

if (!(HAS_TOURNIQUET_APPLIED_ON(GVAR(AEDX_MonitorTarget_Title),_partIndex))) then {

Check notice on line 128 in addons/circulation/functions/fnc_AEDX_ViewMonitor_CPR.sqf

View workflow job for this annotation

GitHub Actions / windows

Unneeded Not 

unneeded not
if (GVAR(PulseRateReady)) then {
GVAR(PulseRateReady) = false;
private _pr = GVAR(AEDX_MonitorTarget_Title) getVariable [QACEGVAR(medical,heartRate), 0];
Expand Down Expand Up @@ -185,7 +185,7 @@
private _pads = false;
private _vitalsMonitor = false;

if !(GVAR(AEDX_MonitorTarget_Title) isEqualTo objNull) then {
if (GVAR(AEDX_MonitorTarget_Title) isNotEqualTo objNull) then {
_pads = GVAR(AEDX_MonitorTarget_Title) getVariable [QGVAR(DefibrillatorPads_Connected), false];
_vitalsMonitor = GVAR(AEDX_MonitorTarget_Title) getVariable [QGVAR(AED_X_VitalsMonitor_Connected), false];
};
Expand All @@ -207,7 +207,7 @@
(_dlg displayCtrl IDC_DISPLAY_SPO2_TITLE) ctrlSetText "---";
};

if !(GVAR(AEDX_MonitorTarget_Title) getVariable [QACEGVAR(medical,CPR_provider), objNull] isEqualTo objNull) then {
if (GVAR(AEDX_MonitorTarget_Title) getVariable [QACEGVAR(medical,CPR_provider), objNull] isNotEqualTo objNull) then {

private _rhythmHR = 0;

Expand Down Expand Up @@ -273,7 +273,7 @@
(_dlg displayCtrl IDC_DISPLAY_SPO2_TITLE) ctrlSetText "---";
};

private _hasEtco2Monitor = !(GVAR(AEDX_MonitorTarget) getVariable [QEGVAR(breathing,etco2Monitor),[]] isEqualTo []);
private _hasEtco2Monitor = (GVAR(AEDX_MonitorTarget) getVariable [QEGVAR(breathing,etco2Monitor),[]] isNotEqualTo []);
private _etco2 = GET_ETCO2(GVAR(AEDX_MonitorTarget));
private _breathrate = GET_BREATHING_RATE(GVAR(AEDX_MonitorTarget));

Expand Down
2 changes: 1 addition & 1 deletion addons/circulation/functions/fnc_AEDX_VitalsMonitor_CheckCondition.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ switch (_AEDOrigin) do {
};
case 2: {
if !(isNull objectParent _patient) then {
_condition = !((itemCargo objectParent _patient) findIf {_x isEqualTo "kat_X_AED"} isEqualTo -1);
_condition = ((itemCargo objectParent _patient) findIf {_x isEqualTo "kat_X_AED"} isNotEqualTo -1);
};
};
default {
Expand Down
14 changes: 7 additions & 7 deletions addons/circulation/functions/fnc_CPRStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if (_notInVehicle) then {
"CPR_MONITOR" cutText ["", "PLAIN",0,true];
_patient setVariable [QGVAR(deviceCode), 0, true];
};

switch (true) do {
case (_deviceCode == 2): {
if ((_patient getVariable [QGVAR(DefibrillatorPads_Connected),false] && ((_patient getVariable [QGVAR(Defibrillator_Provider),[-1,-1,-1]] select 2) isEqualTo 'kat_X_AED')) || (_patient getVariable [QGVAR(AED_X_VitalsMonitor_Connected),false])) then {
Expand All @@ -90,11 +90,11 @@ if (_notInVehicle) then {
GVAR(CPRDisplayActive) = false;
};
};
case (_deviceCode == 1): {
case (_deviceCode == 1): {
if ((_patient getVariable [QEGVAR(breathing,pulseoximeter), false])) then {
if !(GVAR(PulseOxDisplay)) then {
"CPR_MONITOR" cutText ["", "PLAIN",0,true];
"CPR_MONITOR" cutRsc ["CPR_PulseOx", "PLAIN", 0, true];
"CPR_MONITOR" cutRsc ["CPR_PulseOx", "PLAIN", 0, true];
GVAR(PulseOxDisplay) = true;
[_medic, GVAR(CPRTarget)] call FUNC(PulseOx_ViewMonitor);
};
Expand All @@ -109,7 +109,7 @@ if (_notInVehicle) then {

[{
params ["_medic", "_patient", "_notInVehicle", "_CPRStartTime"];

[LLSTRING(StopCPR), LLSTRING(ChangeCPRDevice), ""] call ACEFUNC(interaction,showMouseHint);
[LLSTRING(StartCPR), 1.5, _medic] call ACEFUNC(common,displayTextStructured);

Expand All @@ -119,15 +119,15 @@ if (_notInVehicle) then {

private _patientCondition = (!(IS_UNCONSCIOUS(_patient)) && alive _patient || _patient isEqualTo objNull);
private _medicCondition = (!(alive _medic) || IS_UNCONSCIOUS(_medic) || _medic isEqualTo objNull);
private _vehicleCondition = !(objectParent _medic isEqualTo objectParent _patient);
private _vehicleCondition = (objectParent _medic isNotEqualTo objectParent _patient);
private _distanceCondition = (_patient distance2D _medic > ACEGVAR(medical_gui,maxDistance));

if (_patientCondition || _medicCondition || (_patient getVariable [QACEGVAR(medical,CPR_provider), objNull]) isEqualTo objNull || !(_medic getVariable [QGVAR(isPerformingCPR), false]) || dialog || {(!_notInVehicle && _vehicleCondition) || {(_notInVehicle && _distanceCondition)}}) exitWith { // Stop CPR
[_idPFH] call CBA_fnc_removePerFrameHandler;

_medic setVariable [QGVAR(isPerformingCPR), false, true];

if !(_patient getVariable [QACEGVAR(medical,CPR_provider), objNull] isEqualTo objNull) then {
if (_patient getVariable [QACEGVAR(medical,CPR_provider), objNull] isNotEqualTo objNull) then {
_patient setVariable [QACEGVAR(medical,CPR_provider), objNull, true];
};

Expand Down Expand Up @@ -190,7 +190,7 @@ if (_patient getVariable [QGVAR(RhythmAnalyzed), false]) then {
[{
params ["_medic", "_patient"];

if(!((_patient getVariable [QACEGVAR(medical,CPR_provider), objNull]) isEqualTo objNull) && _patient getVariable [QGVAR(DefibrillatorPads_Connected), false] && !(_patient getVariable [QGVAR(DefibrillatorInUse), false])) then {
if(((_patient getVariable [QACEGVAR(medical,CPR_provider), objNull]) isNotEqualTo objNull) && _patient getVariable [QGVAR(DefibrillatorPads_Connected), false] && !(_patient getVariable [QGVAR(DefibrillatorInUse), false])) then {
private _provider = _patient getVariable QGVAR(Defibrillator_Provider);
private _source = _medic;

Expand Down
6 changes: 3 additions & 3 deletions addons/circulation/functions/fnc_DefibrillatorPlaced_CheckCondition.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
params ["_medic", "_defib", ["_check", 0]];

private _patient = _defib getVariable [QGVAR(Defibrillator_Patient), objNull];
private _patientExists = !(_patient isEqualTo objNull);
private _patientExists = (_patient isNotEqualTo objNull);
private _patientMonitor = _defib getVariable [QGVAR(AED_X_VitalsMonitor_Patient), objNull];
private _patientMonitorExists = !(_patientMonitor isEqualTo objNull);
private _patientMonitorExists = (_patientMonitor isNotEqualTo objNull);
private _condition = false;

switch (_check) do {
Expand Down Expand Up @@ -55,4 +55,4 @@ switch (_check) do {
};
};

_condition && {!(_patient getVariable [QEGVAR(airway,recovery), false]) && (isNull objectParent _patient) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}};
_condition && {!(_patient getVariable [QEGVAR(airway,recovery), false]) && (isNull objectParent _patient) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}};
10 changes: 5 additions & 5 deletions addons/circulation/functions/fnc_Defibrillator_AttachPads.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ switch (_source) do {
}, {
params ["_medic", "_patient", "_provider"];

if !(_patient isEqualTo objNull) then {
if (_patient isNotEqualTo objNull) then {
if (_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) then {
[_medic, _patient] call FUNC(Defibrillator_RemovePads);
[LLSTRING(Defibrillator_PatientDisconnected), 1.5, _medic] call ACEFUNC(common,displayTextStructured);
Expand All @@ -76,11 +76,11 @@ switch (_source) do {
[{ // Remove pads if patient exits vehicle
params ["_medic", "_patient", "_provider"];

!((objectParent _patient) isEqualTo _provider);
((objectParent _patient) isNotEqualTo _provider);
}, {
params ["_medic", "_patient", "_provider"];

if !(_patient isEqualTo objNull) then {
if (_patient isNotEqualTo objNull) then {
[_medic, _patient] call FUNC(Defibrillator_RemovePads);

if ((objectParent _medic) isEqualTo _provider) then {
Expand All @@ -97,11 +97,11 @@ switch (_source) do {
[{ // Remove pads if patient gets too far
params ["_medic", "_patient"];

(_patient distance _medic) > GVAR(Defibrillator_DistanceLimit) || !((objectParent _medic) isEqualTo (objectParent _patient));
(_patient distance _medic) > GVAR(Defibrillator_DistanceLimit) || ((objectParent _medic) isNotEqualTo (objectParent _patient));
}, {
params ["_medic", "_patient"];

if !(_patient isEqualTo objNull) then {
if (_patient isNotEqualTo objNull) then {
if (_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) then {
[_medic, _patient] call FUNC(Defibrillator_RemovePads);
[LLSTRING(Defibrillator_PatientDisconnected), 1.5, _medic] call ACEFUNC(common,displayTextStructured);
Expand Down
2 changes: 1 addition & 1 deletion addons/circulation/functions/fnc_Defibrillator_CheckCondition.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ switch (_defibProvider select 1) do {
_condition = (_patient distance (_defibProvider select 0)) <= GVAR(Defibrillator_DistanceLimit);
};
case 2: {
_condition = !(isNull objectParent _patient) && (objectParent _patient isEqualTo objectParent _medic) && !((itemCargo objectParent _patient) findIf {_x isEqualTo (_defibProvider select 2)} isEqualTo -1);
_condition = !(isNull objectParent _patient) && (objectParent _patient isEqualTo objectParent _medic) && ((itemCargo objectParent _patient) findIf {_x isEqualTo (_defibProvider select 2)} isNotEqualTo -1);
};
default {
_condition = [_medic, _medic, [(_defibProvider select 2)]] call ACEFUNC(medical_treatment,hasItem);
Expand Down
4 changes: 2 additions & 2 deletions addons/circulation/functions/fnc_Defibrillator_Pads_CheckCondition.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ switch (_AEDOrigin) do {
};
case 2: {
if !(isNull objectParent _patient) then {
_condition = !((itemCargo objectParent _patient) findIf {_x isEqualTo _AEDClassname} isEqualTo -1);
_condition = ((itemCargo objectParent _patient) findIf {_x isEqualTo _AEDClassname} isNotEqualTo -1);
};
};
default {
Expand All @@ -51,4 +51,4 @@ switch (_AEDOrigin) do {

if (_exit) exitWith {false};

_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && (objectParent _patient isEqualTo objectParent _medic) && (["",_patient] call ACEFUNC(medical_treatment,canCPR) || GVAR(AED_duringCpr));
_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && (objectParent _patient isEqualTo objectParent _medic) && (["",_patient] call ACEFUNC(medical_treatment,canCPR) || GVAR(AED_duringCpr));
Loading
Loading