From c163d6d53a563744e483e2d10dafd20dbf5120cc Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 7 Sep 2023 14:05:24 -0500 Subject: [PATCH] Laserpointer - Block laser attachments if setting disabled (CBA 3.16.0) (#9346) * Laserpointer - Block laser attachements if setting disabled req https://github.com/CBATeam/CBA_A3/pull/1595 * Apply suggestions from code review * Update addons/main/script_mod.hpp --------- Co-authored-by: jonpas --- addons/laserpointer/XEH_postInit.sqf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/laserpointer/XEH_postInit.sqf b/addons/laserpointer/XEH_postInit.sqf index 3a8d611364b..d2d1aec747d 100644 --- a/addons/laserpointer/XEH_postInit.sqf +++ b/addons/laserpointer/XEH_postInit.sqf @@ -15,12 +15,14 @@ GVAR(greenLaserUnits) = []; ["CBA_settingsInitialized", { // If not enabled, dont't add draw eventhandler or PFEH (for performance) if (!GVAR(enabled)) exitWith { + ["ACE_acc_pointer_red", { false }] call CBA_fnc_addAttachmentCondition; + ["ACE_acc_pointer_green", { false }] call CBA_fnc_addAttachmentCondition; ["CBA_attachmentSwitched", { params ["_unit", "_prevItem", "_newItem", "_currWeaponType"]; TRACE_4("CBA_attachmentSwitched eh",_unit,_prevItem,_newItem,_currWeaponType); if ((getNumber (configFile >> "CfgWeapons" >> _newItem >> "ACE_laserpointer")) > 0) then { TRACE_1("removing ACE_laserpointer",getNumber (configFile >> "CfgWeapons" >> _newItem >> "ACE_laserpointer")); - [1, "prev"] call CBA_accessory_fnc_switchAttachment; + [1, "next"] call CBA_accessory_fnc_switchAttachment; }; }] call CBA_fnc_addEventHandler; };