From 9e6ce52fb6c0017c048c97fbf70fa90fbbe59145 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sun, 28 Jun 2015 21:25:01 +0200 Subject: [PATCH 1/2] Added check to addEarplugs if earplugs are used --- addons/hearing/functions/fnc_addEarPlugs.sqf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/hearing/functions/fnc_addEarPlugs.sqf b/addons/hearing/functions/fnc_addEarPlugs.sqf index 455de07fd9..8e4c5eafef 100644 --- a/addons/hearing/functions/fnc_addEarPlugs.sqf +++ b/addons/hearing/functions/fnc_addEarPlugs.sqf @@ -15,9 +15,12 @@ */ #include "script_component.hpp" -private ["_unit", "_launcher"]; +PARAMS_1(_unit); -_unit = _this select 0; +// Exit if soldier has earplugs already in (persistence scenarios) +if (FUNC(hasEarPlugsIn)) exitWith {}; + +private ["_launcher"]; // add earplugs if the soldier has a rocket launcher _launcher = secondaryWeapon _unit; From 475e4673ebf40856106cf7f52724786668219601 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sun, 28 Jun 2015 22:28:26 +0200 Subject: [PATCH 2/2] Fixed typo --- addons/hearing/functions/fnc_addEarPlugs.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hearing/functions/fnc_addEarPlugs.sqf b/addons/hearing/functions/fnc_addEarPlugs.sqf index 8e4c5eafef..07d35c3c6d 100644 --- a/addons/hearing/functions/fnc_addEarPlugs.sqf +++ b/addons/hearing/functions/fnc_addEarPlugs.sqf @@ -18,7 +18,7 @@ PARAMS_1(_unit); // Exit if soldier has earplugs already in (persistence scenarios) -if (FUNC(hasEarPlugsIn)) exitWith {}; +if ([_unit] call FUNC(hasEarPlugsIn)) exitWith {}; private ["_launcher"];