From 723aebcbf50410dad229c297013d2abda9165e30 Mon Sep 17 00:00:00 2001 From: IndigoFox Date: Tue, 9 Jan 2024 23:03:17 -0800 Subject: [PATCH] fix handler cleanup and make deceased a dark gray --- functions/client/fn_addMedicalOverlayPFH.sqf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/functions/client/fn_addMedicalOverlayPFH.sqf b/functions/client/fn_addMedicalOverlayPFH.sqf index d18e66e..bf3d6b3 100644 --- a/functions/client/fn_addMedicalOverlayPFH.sqf +++ b/functions/client/fn_addMedicalOverlayPFH.sqf @@ -35,13 +35,15 @@ milsim_client_medState3D_colors = [ [0, 0.5, 0, 0.9], // TRIAGE_COLOR_MINIMAL [1, 0.84, 0, 0.9], // TRIAGE_COLOR_DELAYED [1, 0, 0, 0.9], // TRIAGE_COLOR_IMMEDIATE - [0, 0, 0, 0.9], // TRIAGE_COLOR_DECEASED + [0.15, 0.15, 0.15, 0.9], // TRIAGE_COLOR_DECEASED [0.5, 0.5, 0.5, 0] // TRIAGE_COLOR_NONE ]; // Per-frame handler to draw icons // cleanup -[milsim_client_medState3D_drawTargetsPfh] call CBA_fnc_removePerFrameHandler; +if (!isNil "milsim_client_medState3D_pfh") then { + [milsim_client_medState3D_pfh] call CBA_fnc_removePerFrameHandler; +}; // add pfh milsim_client_medState3D_pfh = [{ // if disabled, skip processing @@ -59,6 +61,8 @@ milsim_client_medState3D_pfh = [{ ) then {continue}; // color based on triage level + private _triageLevel = _x getVariable ["ace_medical_triageLevel", -1]; + if (_triageLevel == -1) then {continue}; private _color = milsim_client_medState3D_colors select ( (_x getVariable ["ace_medical_triageLevel", -1]) -1 ); @@ -79,7 +83,9 @@ milsim_client_medState3D_pfh = [{ // subroutine to gather nearest 50 units every 5 seconds and store in milsim_client_medState3D_drawTargets // cleanup -[milsim_client_medState3D_drawTargetsPfh] call CBA_fnc_removePerFrameHandler; +if (!isNil "milsim_client_medState3D_drawTargetsPfh") then { + [milsim_client_medState3D_drawTargetsPfh] call CBA_fnc_removePerFrameHandler; +}; // add pfh milsim_client_medState3D_drawTargetsPfh = [{ milsim_client_medState3D_drawTargets = (