From 981978d043ca65f82c47b0670c499752f71c3d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= <nicolas.d.badano@gmail.com>
Date: Fri, 30 Jan 2015 19:06:25 -0300
Subject: [PATCH] ACE_Settings: replace all ACE_Parameters

---
 addons/explosives/config.cpp     | 12 +++++++---
 addons/interaction/config.cpp    |  7 ++++--
 addons/magazinerepack/config.cpp | 12 +++++++---
 addons/map/config.cpp            | 24 +++++++++++++------
 addons/respawn/config.cpp        | 12 +++++++---
 addons/switchunits/config.cpp    | 40 +++++++++++++++++++++++---------
 addons/vehiclelock/config.cpp    |  7 ++++--
 addons/weather/config.cpp        |  8 -------
 8 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp
index 8bf463c9f4..e4a079f107 100644
--- a/addons/explosives/config.cpp
+++ b/addons/explosives/config.cpp
@@ -39,7 +39,13 @@ class CfgMineTriggers {
   };
 };
 
-class ACE_Parameters_Boolean {
-  GVAR(RequireSpecialist) = 0;
-  GVAR(PunishNonSpecialists) = 1;
+class ACE_Settings {
+  class GVAR(RequireSpecialist) {
+    value = 0;
+    typeName = "BOOL";
+  };
+  class GVAR(PunishNonSpecialists) {
+    value = 1;
+    typeName = "BOOL";
+  };
 };
diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp
index acb41d362f..38933ef506 100644
--- a/addons/interaction/config.cpp
+++ b/addons/interaction/config.cpp
@@ -33,8 +33,11 @@ class ACE_Options {
   };
 };
 
-class ACE_Parameters_Boolean {
-  ACE_Interaction_EnableTeamManagement = 1;
+class ACE_Settings {
+  class GVAR(EnableTeamManagement) {
+    value = 1;
+    typeName = "BOOL";
+  };
 };
 
 class ACE_canInteractConditions {
diff --git a/addons/magazinerepack/config.cpp b/addons/magazinerepack/config.cpp
index 5f2c6edc7d..91a6f5abf5 100644
--- a/addons/magazinerepack/config.cpp
+++ b/addons/magazinerepack/config.cpp
@@ -15,7 +15,13 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 
-class ACE_Parameters_Numeric {
-    GVAR(TimePerAmmo) = 1.5;
-    GVAR(TimePerMagazine) = 2.0;
+class ACE_Settings {
+    class GVAR(TimePerAmmo) {
+        value = 1.5;
+        typeName = "SCALAR";
+    };
+    class GVAR(TimePerMagazine) {
+        value = 2.0;
+        typeName = "SCALAR";
+    };
 };
diff --git a/addons/map/config.cpp b/addons/map/config.cpp
index c9980458db..36a6f85168 100644
--- a/addons/map/config.cpp
+++ b/addons/map/config.cpp
@@ -23,13 +23,23 @@ class RscButtonMenuCancel;
 class RscButtonMenu;
 class RscEdit;
 
-class ACE_Parameters_Numeric {
-  GVAR(BFT_Interval) = 1;
-};
-class ACE_Parameters_Boolean {
-  GVAR(EveryoneCanDrawOnBriefing) = 1;
-  GVAR(BFT_Enabled) = 0;
-  GVAR(BFT_HideAiGroups) = 0;
+class ACE_Settings {
+    class GVAR(BFT_Interval) {
+        value = 1.0;
+        typeName = "SCALAR";
+    };
+    class GVAR(EveryoneCanDrawOnBriefing) {
+        value = 1;
+        typeName = "BOOL";
+    };
+    class GVAR(BFT_Enabled) {
+        value = 0;
+        typeName = "BOOL";
+    };
+    class GVAR(BFT_HideAiGroups) {
+        value = 0;
+        typeName = "BOOL";
+    };
 };
 
 #include "MapGpsUI.hpp"
diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp
index 0d914df949..19032df4f7 100644
--- a/addons/respawn/config.cpp
+++ b/addons/respawn/config.cpp
@@ -17,7 +17,13 @@ class CfgPatches {
 #include "CfgVehicleClasses.hpp"
 #include "CfgVehicles.hpp"
 
-class ACE_Parameters_Boolean {
-    GVAR(SavePreDeathGear) = 0;
-    GVAR(RemoveDeadBodiesDisconnected) = 1;
+class ACE_Settings {
+    class GVAR(SavePreDeathGear) {
+        value = 0;
+        typeName = "BOOL";
+    };
+    class GVAR(RemoveDeadBodiesDisconnected) {
+        value = 1;
+        typeName = "BOOL";
+    };
 };
diff --git a/addons/switchunits/config.cpp b/addons/switchunits/config.cpp
index b89adb3a7a..09d3e05594 100644
--- a/addons/switchunits/config.cpp
+++ b/addons/switchunits/config.cpp
@@ -15,15 +15,33 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 
-class ACE_Parameters_Numeric {
-  GVAR(SafeZoneRadius) = 100;
-};
-
-class ACE_Parameters_Boolean {
-  GVAR(EnableSwitchUnits) = 0;
-  GVAR(SwitchToWest) = 0;
-  GVAR(SwitchToEast) = 0;
-  GVAR(SwitchToIndependent) = 0;
-  GVAR(SwitchToCivilian) = 0;
-  GVAR(EnableSafeZone) = 1;
+class ACE_Settings {
+    class GVAR(SafeZoneRadius) {
+        value = 100;
+        typeName = "SCALAR";
+    };
+    class GVAR(EnableSwitchUnits) {
+        value = 0;
+        typeName = "BOOL";
+    };
+    class GVAR(SwitchToWest) {
+        value = 0;
+        typeName = "BOOL";
+    };
+    class GVAR(SwitchToEast) {
+        value = 0;
+        typeName = "BOOL";
+    };
+    class GVAR(SwitchToIndependent) {
+        value = 0;
+        typeName = "BOOL";
+    };
+    class GVAR(SwitchToCivilian) {
+        value = 0;
+        typeName = "BOOL";
+    };
+    class GVAR(EnableSafeZone) {
+        value = 1;
+        typeName = "BOOL";
+    };
 };
diff --git a/addons/vehiclelock/config.cpp b/addons/vehiclelock/config.cpp
index 83850a2bef..9031987315 100644
--- a/addons/vehiclelock/config.cpp
+++ b/addons/vehiclelock/config.cpp
@@ -12,8 +12,11 @@ class CfgPatches {
   };
 };
 
-class ACE_Parameters_Numeric {
-  GVAR(DefaultLockpickStrength) = 10;
+class ACE_Settings {
+    class GVAR(DefaultLockpickStrength) {
+        value = 10;
+        typeName = "SCALAR";
+    };
 };
 
 #include "CfgEventHandlers.hpp"
diff --git a/addons/weather/config.cpp b/addons/weather/config.cpp
index dc3faecf5f..f59267690f 100644
--- a/addons/weather/config.cpp
+++ b/addons/weather/config.cpp
@@ -14,11 +14,3 @@ class CfgPatches {
 #include "CfgEventhandlers.hpp"
 
 #include "CfgWorlds.hpp"
-
-/*class ACE_Parameters_Numeric {
-  GVAR(XXXX) = 100;
-};
-
-class ACE_Parameters_Boolean {
-  GVAR(XXXX) = 0;
-};*/