From 4f35e10afad1ffff1f2b6c4271bc6d397f69af18 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Sun, 21 Jun 2015 04:46:55 +0200
Subject: [PATCH] Changed BFT_Enabled to module option for proper ACE_Settings
 handling

---
 addons/map/CfgVehicles.hpp                           | 6 ++++++
 addons/map/XEH_postInitClient.sqf                    | 1 -
 addons/map/functions/fnc_blueForceTrackingModule.sqf | 4 ++--
 addons/map/stringtable.xml                           | 6 ++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/map/CfgVehicles.hpp b/addons/map/CfgVehicles.hpp
index 88e6fffc1a..d1b7e38dba 100644
--- a/addons/map/CfgVehicles.hpp
+++ b/addons/map/CfgVehicles.hpp
@@ -49,6 +49,12 @@ class CfgVehicles {
         isGlobal = 1;
         icon = PATHTOF(UI\Icon_Module_BFTracking_ca.paa);
         class Arguments {
+            class Enabled {
+                displayName = CSTRING(BFT_Enabled_DisplayName);
+                description = CSTRING(BFT_Enabled_Description);
+                typeName = "BOOL";
+                defaultValue = 0;
+            };
             class Interval {
                 displayName = CSTRING(BFT_Interval_DisplayName);
                 description = CSTRING(BFT_Interval_Description);
diff --git a/addons/map/XEH_postInitClient.sqf b/addons/map/XEH_postInitClient.sqf
index 255c71ec9e..c06993bded 100644
--- a/addons/map/XEH_postInitClient.sqf
+++ b/addons/map/XEH_postInitClient.sqf
@@ -18,7 +18,6 @@ call FUNC(determineZoom);
     ((findDisplay 12) displayCtrl 51) ctrlAddEventHandler ["Draw", {[] call FUNC(updateMapEffects);}];
 };
 
-[
 ["SettingsInitialized", {
     // Start Blue Force Tracking if Enabled
     if (GVAR(BFT_Enabled)) then {
diff --git a/addons/map/functions/fnc_blueForceTrackingModule.sqf b/addons/map/functions/fnc_blueForceTrackingModule.sqf
index 44af71fbbd..bab776c9ab 100644
--- a/addons/map/functions/fnc_blueForceTrackingModule.sqf
+++ b/addons/map/functions/fnc_blueForceTrackingModule.sqf
@@ -18,9 +18,9 @@ PARAMS_3(_logic,_units,_activated);
 
 if !(_activated) exitWith {};
 
-GVAR(BFT_Enabled) = true;
+[_logic, QGVAR(BFT_Enabled), "Enabled"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(BFT_Interval), "Interval"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(BFT_HideAiGroups), "HideAiGroups"] call EFUNC(common,readSettingFromModule);
 
 diag_log text "[ACE]: Blue Force Tracking Module initialized.";
-TRACE_2("[ACE]: Blue Force Tracking Module initialized.",GVAR(BFT_Interval), GVAR(BFT_HideAiGroups));
+TRACE_2("[ACE]: Blue Force Tracking Module initialized.", GVAR(BFT_Interval), GVAR(BFT_HideAiGroups));
diff --git a/addons/map/stringtable.xml b/addons/map/stringtable.xml
index 7d5a9dda5a..255ef400fe 100644
--- a/addons/map/stringtable.xml
+++ b/addons/map/stringtable.xml
@@ -77,6 +77,12 @@
             <German>Blue Force Tracking</German>
             <Czech>Blue Force Tracking</Czech>
         </Key>
+        <Key ID="STR_ACE_Map_BFT_Enabled_DisplayName">
+            <English>Enable</English>
+        </Key>
+        <Key ID="STR_ACE_Map_BFT_Enabled_Description">
+            <English>Enable Blue Force Tracking. Default: No</English>
+        </Key>
         <Key ID="STR_ACE_Map_BFT_Interval_DisplayName">
             <English>Interval</English>
             <Polish>Interwał</Polish>