Merge branch 'master' into release

Metis-Team · Apr 2, 2020 · 7801ae5 · 7801ae5
2 parents 9b22358 + 76529b5
commit 7801ae5
Show file tree

Hide file tree

Showing 74 changed files with 824 additions and 864 deletions.
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
@@ -19,7 +19,7 @@ INFO_1("Metis Enhanced version: %1.", _version);
     true,
     0,
     {}
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 //grasscutter size
 [
@@ -28,12 +28,12 @@ INFO_1("Metis Enhanced version: %1.", _version);
     [LLSTRING(grasscutter_size), LLSTRING(grasscutter_size_tooltip)],
     LELSTRING(main,settingCategoryCommon),
     [
-        ["Land_ClutterCutter_Large_F", "Land_ClutterCutter_Medium_F"],
+        [0, 1],
         [LLSTRING(grasscutter_size_large), LLSTRING(grasscutter_size_medium)],
         1
     ],
     0,
     {}
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ADDON = true;
diff --git a/addons/common/functions/fnc_addGrassCutter.sqf b/addons/common/functions/fnc_addGrassCutter.sqf
@@ -30,7 +30,7 @@ private _action = [
         };
 
         [5, [], {
-            private _cutter = GVAR(grasscutter_size) createVehicle [0,0,0];
+            private _cutter = (["Land_ClutterCutter_Large_F", "Land_ClutterCutter_Medium_F"] select GVAR(grasscutter_size)) createVehicle [0,0,0];
             _cutter setPos (getpos player);
         }, {}, LLSTRING(grasscutter_removeGrass)
         ] call ace_common_fnc_progressBar;

diff --git a/addons/cords/XEH_preInit.sqf b/addons/cords/XEH_preInit.sqf
@@ -14,7 +14,7 @@ PREP_RECOMPILE_END;
     true,
     0,
     {}
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(playerIDs),
@@ -24,6 +24,6 @@ PREP_RECOMPILE_END;
     "[""""]",
     1,
     {}
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ADDON = true;
diff --git a/addons/cup_enhancement/$PBOPREFIX$ b/addons/cup_enhancement/$PBOPREFIX$
diff --git a/addons/cup_enhancement/CfgWorlds.hpp b/addons/cup_enhancement/CfgWorlds.hpp
diff --git a/addons/cup_enhancement/config.cpp b/addons/cup_enhancement/config.cpp
diff --git a/addons/cup_enhancement/script_component.hpp b/addons/cup_enhancement/script_component.hpp
diff --git a/addons/drill/XEH_preInit.sqf b/addons/drill/XEH_preInit.sqf
@@ -16,6 +16,6 @@ PREP_RECOMPILE_END;
     {
         cutText ["", "PLAIN"];
     }
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ADDON = true;
diff --git a/addons/flagmarker/$PBOPREFIX$ b/addons/flagmarker/$PBOPREFIX$
diff --git a/addons/flagmarker/CfgWeapons.hpp b/addons/flagmarker/CfgWeapons.hpp
diff --git a/addons/flagmarker/XEH_PREP.hpp b/addons/flagmarker/XEH_PREP.hpp