Interaction/Dragging - Remove actions from scripted weaponHolders (#9541

) remove actions from scripted holders
acemod · Oct 20, 2023 · 55566fd · 55566fd
1 parent 124798c
commit 55566fd
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/addons/dragging/CfgEventHandlers.hpp b/addons/dragging/CfgEventHandlers.hpp
@@ -42,6 +42,13 @@ class Extended_Init_EventHandlers {
     class WeaponHolder {
         class ADDON {
             init = QUOTE(_this call FUNC(initObject));
+            exclude[] = {"GroundWeaponHolder_Scripted"};
+        };
+    };
+    class WeaponHolderSimulated {
+        class ADDON {
+            init = QUOTE(_this call FUNC(initObject));
+            exclude[] = {"WeaponHolderSimulated_Scripted"};
         };
     };
     class Land_Camping_Light_F {

diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
@@ -715,6 +715,14 @@ class CfgVehicles {
             };
         };
     };
+    // Don't enable for scripted
+    class WeaponHolderSimulated_Scripted: WeaponHolderSimulated {
+        class ACE_Actions: ACE_Actions {
+            class ACE_MainActions: ACE_MainActions {
+                delete GVAR(Gear);
+            };
+        };
+    };
 
     class ReammoBox;
     // dropped weapons/gear
@@ -733,6 +741,19 @@ class CfgVehicles {
             };
         };
     };
+    // Don't enable for scripted
+    class GroundWeaponHolder: WeaponHolder {
+        class ACE_Actions: ACE_Actions {
+            class ACE_MainActions;
+        };
+    };
+    class GroundWeaponHolder_Scripted: GroundWeaponHolder {
+        class ACE_Actions: ACE_Actions {
+            class ACE_MainActions: ACE_MainActions {
+                delete GVAR(Gear);
+            };
+        };
+    };
 
     class Lamps_base_F;
     class Land_PortableLight_single_F: Lamps_base_F {