From 2e48a92eefbd60449ffb423be94c06ea176ef875 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Fri, 18 Sep 2015 22:25:09 +0200
Subject: [PATCH] fix ai seemingly reloading disposable launcher at mission
 start, fix #2508

---
 addons/disposable/CfgVehicles.hpp             | 102 +++++++++---------
 .../functions/fnc_takeLoadedATWeapon.sqf      |   2 +
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/addons/disposable/CfgVehicles.hpp b/addons/disposable/CfgVehicles.hpp
index 13d4cedf4b..0ad3ff51c0 100644
--- a/addons/disposable/CfgVehicles.hpp
+++ b/addons/disposable/CfgVehicles.hpp
@@ -1,5 +1,5 @@
 class CfgVehicles {
-#define MACRO_NONLAW \
+    #define MACRO_NONLAW \
         class TransportMagazines { \
             class _xx_NLAW_F { \
                 count = 0; \
@@ -73,56 +73,56 @@ class CfgVehicles {
         MACRO_NONLAW
     };
     /*class B_APC_Tracked_01_base_F: APC_Tracked_01_base_F {
-    MACRO_NONLAW
-};
-class B_APC_Tracked_01_rcws_F: B_APC_Tracked_01_base_F {
-    MACRO_NONLAW
-};
-class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F {
-    MACRO_NONLAW
-};
-class B_APC_Tracked_01_AA_F: B_APC_Tracked_01_base_F {
-    MACRO_NONLAW
-};*/
+        MACRO_NONLAW
+    };
+    class B_APC_Tracked_01_rcws_F: B_APC_Tracked_01_base_F {
+        MACRO_NONLAW
+    };
+    class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F {
+        MACRO_NONLAW
+    };
+    class B_APC_Tracked_01_AA_F: B_APC_Tracked_01_base_F {
+        MACRO_NONLAW
+    };*/
 
     class Car_F;
     class MRAP_01_base_F: Car_F {
         MACRO_NONLAW
     };
     /*class MRAP_01_gmg_base_F: MRAP_01_base_F {
-    MACRO_NONLAW
-};
-class MRAP_01_hmg_base_F: MRAP_01_gmg_base_F {
-    MACRO_NONLAW
-};
-class B_MRAP_01_F: MRAP_01_base_F {
-    MACRO_NONLAW
-};
-class B_MRAP_01_gmg_F: MRAP_01_gmg_base_F {
-    MACRO_NONLAW
-};
-class B_MRAP_01_hmg_F: MRAP_01_hmg_base_F {
-    MACRO_NONLAW
-};*/
+        MACRO_NONLAW
+    };
+    class MRAP_01_hmg_base_F: MRAP_01_gmg_base_F {
+        MACRO_NONLAW
+    };
+    class B_MRAP_01_F: MRAP_01_base_F {
+        MACRO_NONLAW
+    };
+    class B_MRAP_01_gmg_F: MRAP_01_gmg_base_F {
+        MACRO_NONLAW
+    };
+    class B_MRAP_01_hmg_F: MRAP_01_hmg_base_F {
+        MACRO_NONLAW
+    };*/
 
     class MRAP_03_base_F: Car_F {
         MACRO_NONLAW
     };
     /*class MRAP_03_hmg_base_F: MRAP_03_base_F {
-    MACRO_NONLAW
-};
-class MRAP_03_gmg_base_F: MRAP_03_hmg_base_F {
-    MACRO_NONLAW
-};
-class I_MRAP_03_F: MRAP_03_base_F {
-    MACRO_NONLAW
-};
-class I_MRAP_03_hmg_F: MRAP_03_hmg_base_F {
-    MACRO_NONLAW
-};
-class I_MRAP_03_gmg_F: MRAP_03_gmg_base_F {
-    MACRO_NONLAW
-};*/
+        MACRO_NONLAW
+    };
+    class MRAP_03_gmg_base_F: MRAP_03_hmg_base_F {
+        MACRO_NONLAW
+    };
+    class I_MRAP_03_F: MRAP_03_base_F {
+        MACRO_NONLAW
+    };
+    class I_MRAP_03_hmg_F: MRAP_03_hmg_base_F {
+        MACRO_NONLAW
+    };
+    class I_MRAP_03_gmg_F: MRAP_03_gmg_base_F {
+        MACRO_NONLAW
+    };*/
 
     class Wheeled_APC_F: Car_F {};
     class APC_Wheeled_03_base_F: Wheeled_APC_F {
@@ -132,15 +132,15 @@ class I_MRAP_03_gmg_F: MRAP_03_gmg_base_F {
         MACRO_NONLAW
     };
     /*class B_APC_Wheeled_01_base_F: APC_Wheeled_01_base_F {
-    MACRO_NONLAW
-};
-class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F {
-    MACRO_NONLAW
-};
-class I_APC_Wheeled_03_base_F: APC_Wheeled_03_base_F {
-    MACRO_NONLAW
-};
-class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F {
-    MACRO_NONLAW
-};*/
+        MACRO_NONLAW
+    };
+    class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F {
+        MACRO_NONLAW
+    };
+    class I_APC_Wheeled_03_base_F: APC_Wheeled_03_base_F {
+        MACRO_NONLAW
+    };
+    class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F {
+        MACRO_NONLAW
+    };*/
 };
diff --git a/addons/disposable/functions/fnc_takeLoadedATWeapon.sqf b/addons/disposable/functions/fnc_takeLoadedATWeapon.sqf
index b379584b68..de7cdefd70 100644
--- a/addons/disposable/functions/fnc_takeLoadedATWeapon.sqf
+++ b/addons/disposable/functions/fnc_takeLoadedATWeapon.sqf
@@ -36,6 +36,7 @@ if (isClass _config && {getText (_config >> "ACE_UsedTube") != ""} && {getNumber
 
     if (backpack _unit == "") then {
         _unit addBackpack "Bag_Base";
+        _unit removeWeapon _launcher;
         _unit addMagazine _magazine;
         _didAdd = _magazine in (magazines _unit);
         _unit addWeapon _launcher;
@@ -45,6 +46,7 @@ if (isClass _config && {getText (_config >> "ACE_UsedTube") != ""} && {getNumber
         };
         removeBackpack _unit;
     } else {
+        _unit removeWeapon _launcher;
         _unit addMagazine _magazine;
         _didAdd = _magazine in (magazines _unit);
         _unit addWeapon _launcher;