From 9c7511df0b74915c4e56d9f0065dbf028154e0f5 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Wed, 15 Nov 2017 15:19:07 -0600
Subject: [PATCH] Remove missileGuidance setting (#5778)

---
 addons/missileguidance/ACE_Settings.hpp | 9 ---------
 addons/missileguidance/XEH_pre_init.sqf | 5 +++++
 addons/missileguidance/config.cpp       | 1 -
 3 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 addons/missileguidance/ACE_Settings.hpp

diff --git a/addons/missileguidance/ACE_Settings.hpp b/addons/missileguidance/ACE_Settings.hpp
deleted file mode 100644
index 6394e75390..0000000000
--- a/addons/missileguidance/ACE_Settings.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-class ACE_Settings {
-    class GVAR(enabled) {
-        value = 2;
-        typeName = "SCALAR";
-        displayName = CSTRING(Title);
-        description = CSTRING(Desc);
-        values[] = {CSTRING(Off), CSTRING(PlayerOnly), CSTRING(PlayerAndAi)};
-    };
-};
diff --git a/addons/missileguidance/XEH_pre_init.sqf b/addons/missileguidance/XEH_pre_init.sqf
index b47cf6628d..f377efddb6 100644
--- a/addons/missileguidance/XEH_pre_init.sqf
+++ b/addons/missileguidance/XEH_pre_init.sqf
@@ -6,4 +6,9 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+// Formally a ace_setting, users can still disable by `setting ace_missileguidance_enabled = x;` 
+// [0 - Off , 1 - PlayerOnly, 2 - PlayerAndAi]
+// As weapons take config changes, there is little point in being able to disable guidance
+if (isNil QGVAR(enabled)) then { GVAR(enabled) = 2; };
+
 ADDON = true;
diff --git a/addons/missileguidance/config.cpp b/addons/missileguidance/config.cpp
index ce75e277b4..0ce70a6026 100644
--- a/addons/missileguidance/config.cpp
+++ b/addons/missileguidance/config.cpp
@@ -14,7 +14,6 @@ class CfgPatches {
 };
 
 #include "ACE_GuidanceConfig.hpp"
-#include "ACE_Settings.hpp"
 
 #include "CfgEventhandlers.hpp"
 #include "CfgAmmo.hpp"