From 62c2756c9d5fbcc8ae2a9728dc591e393bc25551 Mon Sep 17 00:00:00 2001
From: lambdatiger <spam.stnuocca.sl@gmail.com>
Date: Thu, 30 Jan 2025 13:30:25 -0600
Subject: [PATCH 1/2] Align JAM compat with changes in inheritance made in CSLA
 1.2

---
 addons/jam/jam_csla/CfgWeapons.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/jam/jam_csla/CfgWeapons.hpp b/addons/jam/jam_csla/CfgWeapons.hpp
index 21cfed792..44908d28d 100644
--- a/addons/jam/jam_csla/CfgWeapons.hpp
+++ b/addons/jam/jam_csla/CfgWeapons.hpp
@@ -70,7 +70,7 @@ class CfgWeapons {
 
     class US85_MachinegunBase_7_62: US85_MachinegunBase_5_56 {};
 
-    class US85_M60: US85_MachinegunBase_7_62 {
+    class US85_M60_base: US85_MachinegunBase_7_62 {
         magazineWell[] += {"CBA_762x51_LINKS"};
     };
 

From 0132d1bd2ad8afba449cf01d7f5ebadd45627b67 Mon Sep 17 00:00:00 2001
From: lambdatiger <spam.stnuocca.sl@gmail.com>
Date: Thu, 30 Jan 2025 13:30:51 -0600
Subject: [PATCH 2/2] Fix missing static weapon XEH and fix UBC

---
 addons/xeh/xeh_csla/CfgVehicles.hpp | 33 ++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/addons/xeh/xeh_csla/CfgVehicles.hpp b/addons/xeh/xeh_csla/CfgVehicles.hpp
index 47c2fd1cb..f63427a39 100644
--- a/addons/xeh/xeh_csla/CfgVehicles.hpp
+++ b/addons/xeh/xeh_csla/CfgVehicles.hpp
@@ -1,3 +1,4 @@
+#define XEH_ENABLED_INHERIT class EventHandlers: EventHandlers {class XEH_CLASS: XEH_CLASS_BASE {};}; SLX_XEH_DISABLED = 0
 class CfgVehicles {
     class StaticATWeapon;
     class CSLA_9K113_Stat: StaticATWeapon {
@@ -16,21 +17,47 @@ class CfgVehicles {
 
     class Plane_Base_F;
     class CSLA_Plane_base_F: Plane_Base_F {};
-    class CSLA_CIV_Plane_base_F: CSLA_Plane_base_F {};
+    class CSLA_CIV_Plane_base_F: CSLA_Plane_base_F {
+        class EventHandlers;
+    };
     class CSLA_CIV_Plane_base: CSLA_CIV_Plane_base_F {
-        XEH_ENABLED;
+        XEH_ENABLED_INHERIT;
     };
 
     class StaticMGWeapon;
     class CSLA_UK59L_Stat: StaticMGWeapon {
         XEH_ENABLED;
     };
-
     class CSLA_UK59T_Stat: StaticMGWeapon {
         XEH_ENABLED;
     };
 
+    class CSLA_DShKM_h_Stat: StaticMGWeapon {
+        XEH_ENABLED;
+    };
+
+    class CSLA_AGS17_Stat: StaticMGWeapon {
+        XEH_ENABLED;
+    };
+
+    class US85_M60_Stat: StaticMGWeapon {
+        XEH_ENABLED;
+    };
+
+    class US85_M2l: StaticMGWeapon {
+        XEH_ENABLED;
+    };
+
+    class US85_Mk19_stat: StaticMGWeapon {
+        XEH_ENABLED;
+    };
+
     class US85_M252_Stat: Mortar_01_base_F {
         XEH_ENABLED;
     };
+
+    class HelicopterWreck;
+    class CSLA_Mi24_wreck: HelicopterWreck {
+        XEH_ENABLED;
+    };
 };