Laserpointer - Block laser attachements if setting disabled

req CBATeam/CBA_A3#1595
acemod · Aug 27, 2023 · ee36fdd · ee36fdd
1 parent 0bee761
commit ee36fdd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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_addAttachementCondition;
+        ["ACE_acc_pointer_green", { false }] call CBA_fnc_addAttachementCondition;
         ["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;
     };

diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
@@ -11,7 +11,7 @@
 
 // MINIMAL required version for the Mod. Components can specify others..
 #define REQUIRED_VERSION 2.12
-#define REQUIRED_CBA_VERSION {3,15,7}
+#define REQUIRED_CBA_VERSION {3,15,9}
 
 #ifdef COMPONENT_BEAUTIFIED
     #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)