From 1cafbd204ac46dee4e8aa52d5d082f64a0d8a28c Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Fri, 2 Aug 2019 22:18:21 +0200
Subject: [PATCH 1/3] move scope expressions to nobin component

---
 addons/ee/$NOBIN$          |  0
 addons/ee/config.cpp       | 30 ++++++++++++++++++++++++++++++
 addons/xeh/CfgVehicles.hpp | 22 ----------------------
 addons/xeh/ee/config.cpp   |  6 ------
 4 files changed, 30 insertions(+), 28 deletions(-)
 create mode 100644 addons/ee/$NOBIN$
 create mode 100644 addons/ee/config.cpp
 delete mode 100644 addons/xeh/ee/config.cpp

diff --git a/addons/ee/$NOBIN$ b/addons/ee/$NOBIN$
new file mode 100644
index 000000000..e69de29bb
diff --git a/addons/ee/config.cpp b/addons/ee/config.cpp
new file mode 100644
index 000000000..33dee6269
--- /dev/null
+++ b/addons/ee/config.cpp
@@ -0,0 +1,30 @@
+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/xeh/CfgVehicles.hpp b/addons/xeh/CfgVehicles.hpp
index e1dcfbb58..c23e1de8f 100644
--- 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
deleted file mode 100644
index 1dc18df17..000000000
--- a/addons/xeh/ee/config.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-class CfgPatches {
-    class cba_ee {
-        requiredAddons[] = {"cba_xeh"};
-        units[] = {};
-    };
-};

From c0c34da5322d9b702a08a460352d8288987bacc4 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 2 Aug 2019 15:21:32 -0500
Subject: [PATCH 2/3] Create $PBOPREFIX$

---
 addons/ee/$PBOPREFIX$ | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 addons/ee/$PBOPREFIX$

diff --git a/addons/ee/$PBOPREFIX$ b/addons/ee/$PBOPREFIX$
new file mode 100644
index 000000000..58937b0bf
--- /dev/null
+++ b/addons/ee/$PBOPREFIX$
@@ -0,0 +1 @@
+x\cba\addons\ee

From 2942dc1c49b840674426fee6118afd9f90a99d38 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sun, 4 Aug 2019 19:29:15 +0200
Subject: [PATCH 3/3] function header

---
 addons/ee/config.cpp           | 2 ++
 addons/ee/script_component.hpp | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 addons/ee/script_component.hpp

diff --git a/addons/ee/config.cpp b/addons/ee/config.cpp
index 33dee6269..e8cd5ceb8 100644
--- a/addons/ee/config.cpp
+++ b/addons/ee/config.cpp
@@ -1,3 +1,5 @@
+#include "script_component.hpp"
+
 class CfgPatches {
     class cba_ee {
         requiredAddons[] = {"cba_xeh"};
diff --git a/addons/ee/script_component.hpp b/addons/ee/script_component.hpp
new file mode 100644
index 000000000..873a53243
--- /dev/null
+++ b/addons/ee/script_component.hpp
@@ -0,0 +1 @@
+#include "\x\cba\addons\xeh\script_component.hpp"