From 8435497fe6589fab6e5e4c710f88893589cf5b15 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sat, 30 Nov 2019 18:05:02 +0100
Subject: [PATCH] fix vehicle config, add gwh

---
 addons/flashlights/CfgEventHandlers.hpp |  1 -
 addons/flashlights/CfgVehicles.hpp      | 56 +++++++++++++++----------
 addons/flashlights/config.cpp           |  9 +++-
 3 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/addons/flashlights/CfgEventHandlers.hpp b/addons/flashlights/CfgEventHandlers.hpp
index 58b84ad864..bf70b57b88 100644
--- a/addons/flashlights/CfgEventHandlers.hpp
+++ b/addons/flashlights/CfgEventHandlers.hpp
@@ -1,4 +1,3 @@
-
 class Extended_PostInit_EventHandlers {
     class ADDON {
         clientInit = QUOTE(call COMPILE_FILE(XEH_postInitClient));
diff --git a/addons/flashlights/CfgVehicles.hpp b/addons/flashlights/CfgVehicles.hpp
index fa766ad87b..dbdf5421bc 100644
--- a/addons/flashlights/CfgVehicles.hpp
+++ b/addons/flashlights/CfgVehicles.hpp
@@ -7,18 +7,17 @@ class CfgVehicles {
     };
 
     class Item_Base_F;
-
     class ACE_Flashlight_MX991Item: Item_Base_F {
         scope = 2;
         scopeCurator = 2;
         displayName = CSTRING(MX991_DisplayName);
         author = ECSTRING(common,ACETeam);
-        vehicleClass = "WeaponAccessories";
+        editorCategory = "EdCat_Equipment";
+        editorSubcategory = "EdSubcat_InventoryItems";
+        vehicleClass = "Items";
+
         class TransportItems {
-            class ACE_Flashlight_MX991 {
-                name = "ACE_Flashlight_MX991";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_Flashlight_MX991,1);
         };
     };
 
@@ -27,12 +26,12 @@ class CfgVehicles {
         scopeCurator = 2;
         displayName = CSTRING(KSF1_DisplayName);
         author = ECSTRING(common,ACETeam);
-        vehicleClass = "WeaponAccessories";
+        editorCategory = "EdCat_Equipment";
+        editorSubcategory = "EdSubcat_InventoryItems";
+        vehicleClass = "Items";
+
         class TransportItems {
-            class ACE_Flashlight_KSF1 {
-                name = "ACE_Flashlight_KSF1";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_Flashlight_KSF1,1);
         };
     };
 
@@ -41,38 +40,52 @@ class CfgVehicles {
         scopeCurator = 2;
         displayName = CSTRING(XL50_DisplayName);
         author = ECSTRING(common,ACETeam);
-        vehicleClass = "WeaponAccessories";
+        editorCategory = "EdCat_Equipment";
+        editorSubcategory = "EdSubcat_InventoryItems";
+        vehicleClass = "Items";
+
         class TransportItems {
-            class ACE_Flashlight_XL50 {
-                name = "ACE_Flashlight_XL50";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_Flashlight_XL50,1);
+        };
+    };
+
+    class Pistol_Base_F;
+    class ACE_Item_Flashlight_Maglite_ML300L: Pistol_Base_F {
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(Maglite_ML300L_DisplayName);
+        author = ECSTRING(common,ACETeam);
+        editorCategory = "EdCat_Equipment";
+        editorSubcategory = "EdSubcat_InventoryItems";
+        vehicleClass = "Items";
+
+        class TransportItems {
+            MACRO_ADDITEM(ACE_Flashlight_Maglite_ML300L,1);
         };
     };
 
     class NATO_Box_Base;
-    class EAST_Box_Base;
-    class IND_Box_Base;
-    class FIA_Box_Base_F;
-
     class Box_NATO_Support_F: NATO_Box_Base {
         class TransportItems {
             MACRO_ADDITEM(ACE_Flashlight_MX991,12);
         };
     };
 
+    class EAST_Box_Base;
     class Box_East_Support_F: EAST_Box_Base {
         class TransportItems {
             MACRO_ADDITEM(ACE_Flashlight_KSF1,12);
         };
     };
 
+    class IND_Box_Base;
     class Box_IND_Support_F: IND_Box_Base {
         class TransportItems {
             MACRO_ADDITEM(ACE_Flashlight_XL50,12);
         };
     };
 
+    class FIA_Box_Base_F;
     class Box_FIA_Support_F: FIA_Box_Base_F {
         class TransportItems {
             MACRO_ADDITEM(ACE_Flashlight_MX991,12);
@@ -84,6 +97,7 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_Flashlight_MX991,12);
             MACRO_ADDITEM(ACE_Flashlight_KSF1,12);
             MACRO_ADDITEM(ACE_Flashlight_XL50,12);
+            MACRO_ADDITEM(ACE_Flashlight_Maglite_ML300L,2);
         };
     };
-};
\ No newline at end of file
+};
diff --git a/addons/flashlights/config.cpp b/addons/flashlights/config.cpp
index c1a84c1d17..f88afc0663 100644
--- a/addons/flashlights/config.cpp
+++ b/addons/flashlights/config.cpp
@@ -3,7 +3,12 @@
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
-        units[] = {};
+        units[] = {
+            "ACE_Flashlight_MX991Item",
+            "ACE_Flashlight_KSF1Item",
+            "ACE_Flashlight_XL50Item",
+            "ACE_Item_Flashlight_Maglite_ML300L"
+        };
         weapons[] = {
             "ACE_Flashlight_MX991",
             "ACE_Flashlight_KSF1",
@@ -13,7 +18,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_interaction"};
         author = ECSTRING(common,ACETeam);
-        authors[] = {"voiper", "bux", "HorribleGoat"};
+        authors[] = {"voiper","bux","HorribleGoat"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };