Merge pull request #1199 from CBATeam/nobinXEH

Nobin xeh
CBATeam · Aug 4, 2019 · 62e461a · 62e461a
2 parents 831f738 + 2942dc1
commit 62e461a
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 28 deletions.
diff --git a/addons/ee/$NOBIN$ b/addons/ee/$NOBIN$
diff --git a/addons/ee/$PBOPREFIX$ b/addons/ee/$PBOPREFIX$
@@ -0,0 +1 @@
+x\cba\addons\ee
diff --git a/addons/ee/config.cpp b/addons/ee/config.cpp
@@ -0,0 +1,32 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class cba_ee {
+        requiredAddons[] = {"cba_xeh"};
+        units[] = {};
+    };
+};
+
+class CfgVehicles {
+    class B_W_Soldier_F;
+    class B_W_Story_Protagonist_01_F: B_W_Soldier_F {
+        XEH_ENABLED;
+        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')"; // Inherits from a public base class. Downgrade to protected if Contact component is not loaded.
+    };
+    class B_W_Story_Major_01_F: B_W_Soldier_F {
+        XEH_ENABLED;
+        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
+    };
+    class B_W_Story_Instructor_01_F: B_W_Soldier_F {
+        XEH_ENABLED;
+        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
+    };
+    class B_W_Story_Soldier_01_F: B_W_Soldier_F {
+        XEH_ENABLED;
+        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
+    };
+    class B_W_Story_Leader_01_F: B_W_Soldier_F {
+        XEH_ENABLED;
+        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
+    };
+};
diff --git a/addons/ee/script_component.hpp b/addons/ee/script_component.hpp
@@ -0,0 +1 @@
+#include "\x\cba\addons\xeh\script_component.hpp"
diff --git a/addons/xeh/CfgVehicles.hpp b/addons/xeh/CfgVehicles.hpp
@@ -356,28 +356,6 @@ class CfgVehicles {
         XEH_ENABLED;
     };
 
-    class B_W_Soldier_F;
-    class B_W_Story_Protagonist_01_F: B_W_Soldier_F {
-        XEH_ENABLED;
-        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')"; // Inherits from a public base class. Downgrade to protected if Contact component is not loaded.
-    };
-    class B_W_Story_Major_01_F: B_W_Soldier_F {
-        XEH_ENABLED;
-        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
-    };
-    class B_W_Story_Instructor_01_F: B_W_Soldier_F {
-        XEH_ENABLED;
-        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
-    };
-    class B_W_Story_Soldier_01_F: B_W_Soldier_F {
-        XEH_ENABLED;
-        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
-    };
-    class B_W_Story_Leader_01_F: B_W_Soldier_F {
-        XEH_ENABLED;
-        scope = "1 + parseNumber isClass (configFile >> 'CfgPatches' >> 'A3_Data_F_Contact')";
-    };
-
     class O_R_Soldier_Base_F;
     class O_R_Story_Capitan_01_F: O_R_Soldier_Base_F {
         XEH_ENABLED;

diff --git a/addons/xeh/ee/config.cpp b/addons/xeh/ee/config.cpp