Merge pull request #1709 from Drofseh/magwell-additions

JAM - Add additional magwells and fix a couple bugs

addons/jam/CfgMagazineWells.hpp

@@ -77,6 +77,8 @@ class CfgMagazineWells {
     // AT and AA Launchers, ordered lexicographically
 
     class CBA_Bazooka {};                           // M1, M1A1 Bazooka
+    class CBA_M47_Dragon {};                        // M47 Dragon
+    class CBA_M67 {};                               // M67 Recoilless Rifle
     class CBA_Panzerschreck {};                     // Panzerschreck RPzB 54
     class CBA_PIAT {};                              // PIAT
     class CBA_SMAW {};                              // Mk 153 Shoulder-Launched Multipurpose Assault Weapon

addons/jam/magwells_338LM.hpp

@@ -1,2 +1,3 @@
     class CBA_338LM_AI {};          // AI .338 Lapua Magnum
+    class CBA_338LM_RS9 {};         // Haenel RS9, G29
     class CBA_338LM_T5000 {};       // ORSIS T-5000

addons/jam/magwells_357Mag.hpp

@@ -3,4 +3,3 @@
 
     class CBA_357_6rnds {};             // 6 loose rounds of .357 Magnum
     class CBA_357_5rnds {};             // 5 loose rounds of .357 Magnum
-

addons/jam/magwells_357SIG.hpp

@@ -1,6 +1,7 @@
-    class CBA_375SIG_Glock_SubC {};     // Subcompact Glock in 375SIGmm (Glock 33)
-    class CBA_375SIG_Glock_Cpct {};     // Compact Glock in 375SIGmm (Glock 32)
-    class CBA_375SIG_Glock_Full {};     // Fullsize Glock in 375SIGmm (Glock 31)
+    class CBA_375SIG_Glock_SubC {};     // Subcompact Glock in .357 SIG (Glock 33)
+    class CBA_375SIG_Glock_Cpct {};     // Compact Glock in .357 SIG (Glock 32)
+    class CBA_375SIG_Glock_Full {};     // Fullsize Glock in .357 SIG (Glock 31)
     class CBA_357SIG_P226 {};           // SIG P226
     class CBA_357SIG_P229 {};           // SIG P229
     class CBA_357SIG_P239 {};           // SIG P239
+    class CBA_357SIG_USP_C {};          // HK USP Compact in .357 SIG

addons/jam/magwells_40SW.hpp

@@ -1,4 +1,3 @@
-
     class CBA_40SW_CZ2075 {};       // Subcompact CZ 2075 in .40 S&W
     class CBA_40SW_CZ75_Cpct {};    // Compact CZ 75, CZ 85 in .40 S&W
     class CBA_40SW_CZ75_Full {};    // Fullsize CZ 75, CZ 85 in .40 S&W
@@ -12,3 +11,6 @@
     class CBA_40SW_P229 {};         // SIG P229 .40 S&W
     class CBA_40SW_P239 {};         // SIG P239 .40 S&W
     class CBA_40SW_UMP {};          // HK UMP 40
+    class CBA_40SW_USP {};          // HK USP, USP40, USP Tactical in .40S&W
+    class CBA_40SW_USP_C {};        // HK USP Compact in .40S&W
+    class CBA_40SW_USP_E {};        // HK USP Match/Expert in .40S&W

addons/jam/magwells_40mm.hpp

@@ -38,3 +38,4 @@
         };
     };
     class CBA_40mm_M203_6rnds {};   // 6 loose M203 type grenades for M32 MGL
+    class CBA_40mm_M203_12rnds {};  // 12 loose M203 type grenades for Hawk MM-1

addons/jam/magwells_45ACP.hpp

@@ -1,10 +1,16 @@
+    class CBA_45ACP_Clip_6rnds {};      // 6 round .45 ACP moon clip or speed loader
+    class CBA_45ACP_Clip_5rnds {};      // 5 round .45 ACP moon clip or speed loader
+
+    class CBA_45ACP_6rnds {};           // 6 loose rounds of .45 ACP
+    class CBA_45ACP_5rnds {};           // 5 loose rounds of .45 ACP
+
     class CBA_45ACP_1911 {              // Colt M1911
         BI_mags[] = {
             "9Rnd_45ACP_Mag"
         };
     };
     class CBA_45ACP_C96 {};             // Mauser C-96 in .45 ACP
-    class CBA_9x19_CZ97 {};             // CZ 97 in .45 ACP
+    class CBA_45ACP_CZ97 {};            // CZ 97 in .45 ACP
     class CBA_45ACP_Delisle {};         // De Lisle Carbine
     class CBA_45ACP_Glock_Slim {};      // Slimline Glock in .45 ACP (Glock 36)
     class CBA_45ACP_Glock_Cpct {};      // Compact Glock in .45 ACP (Glock 29)
@@ -16,8 +22,11 @@
             "30Rnd_45ACP_Mag_SMG_01_Tracer_Yellow"
         };
     };
-    class CBA_45ACP_Grease {};          // Grease Gun
+    class CBA_45ACP_Grease {};          // Grease Gun, MAC-10, M-10, M10, Military Armament Corporation Model 10 in .45 ACP
     class CBA_45ACP_Reising {};         // M50/M55 Reising
     class CBA_45ACP_Thompson_Stick {};  // Thompson stick magazines
     class CBA_45ACP_Thompson_Drum {};   // Thompson drum magazines
     class CBA_45ACP_UMP {};             // HK UMP 45
+    class CBA_45ACP_USP {};             // HK USP, USP45, USP Tactical, HK45 in .45 ACP
+    class CBA_45ACP_USP_C {};           // HK USP Compact, HK45C in .45 ACP
+    class CBA_45ACP_USP_E {};           // HK USP Match/Expert/Elite in .45 ACP

addons/jam/magwells_762x39.hpp

@@ -17,7 +17,7 @@
     class CBA_762x39_STANAG_2D {};      // 762x39mm in a twin-drum STANAG mag
     class CBA_762x39_STANAG_2D_XL {};   // 762x39mm in an extra large twin-drum STANAG mag
 
-    class CBA_762x39_VZ58 {};           // 762x39mm VZ58 magazine, cannot be used in AKs or vice versa
-
     class CBA_762x39_SKS {};            // 762x39mm SKS magazines
     class CBA_762x39_SKS_Clip {};       // 762x39mm SKS clip
+
+    class CBA_762x39_VZ58 {};           // 762x39mm VZ58 magazine, cannot be used in AKs or vice versa

addons/jam/magwells_9x19.hpp

@@ -15,6 +15,7 @@
     class CBA_9x19_HiPower {};      // Browning HiPower
     class CBA_9x19_M9 {};           // Beretta M9
     class CBA_9x19_MAB38 {};        // Beretta Model 38
+    class CBA_9x19_MAC10 {};        // MAC-10, M-10, M10, Military Armament Corporation Model 10 in 9x19mm
     class CBA_9x19_MP28 {};         // MP18 Straight Magazines, MP28
     class CBA_9x19_MP35 {};         // MP35
     class CBA_9x19_MP40 {};         // MP40, MP38
@@ -54,6 +55,9 @@
     class CBA_9x19_STEYR {};        // AUG SMG, MPi, TMP
     class CBA_9x19_TT {};           // TT-33 Tokarev in 9x19mm (M48, Tokagypt 58, Type 54)
     class CBA_9x19_UMP {};          // HK UMP 9
+    class CBA_9x19_USP {};          // HK USP, USP9, USP Tactical, P8, P8A1 in 9x19mm
+    class CBA_9x19_USP_C {};        // HK USP Compact, P10 in 9x19mm
+    class CBA_9x19_USP_E {};        // HK USP Match/Expert/Elite in 9x19mm
     class CBA_9x19_UZI {};          // UZI
     class CBA_9x19_UZI_Pro {};      // UZI Pro
     class CBA_9x19_Vis {};          // wz. 35 Vis (Radom)