WIP: Arma vanilla magwells

addons/jam/CfgMagazineWells.hpp

@@ -69,9 +69,10 @@ class CfgMagazineWells {
     class CBA_Panzerschreck {}; // Panzerschreck RPzB 54
     class CBA_PIAT {};          // PIAT
 
-    class CBA_RPG7 {
+    class CBA_RPG7 { //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_rockets[] = {
             "RPG7_F"
         };
     };
+    class RPG7 {};
 };

addons/jam/CfgWeapons.hpp

@@ -5,96 +5,96 @@ class CfgWeapons {
     class Launcher_Base_F;
 
     class mk20_base_F: Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
+        magazineWell[] += {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
     };
     class SDAR_base_F: Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG"};
+        magazineWell[] += {"CBA_556x45_STANAG"};
     };
     class Tavor_base_F: Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
+        magazineWell[] += {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
     };
     class arifle_SPAR_01_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
+        magazineWell[] += {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
     };
     class arifle_SPAR_02_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
+        magazineWell[] += {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
     };
 
     class UGL_F : GrenadeLauncher {
-        magazineWell[] = {"CBA_40mm_M203", "CBA_40mm_EGLM"};
+        magazineWell[] += {"CBA_40mm_M203", "CBA_40mm_EGLM"};
     };
 
     class arifle_MX_Base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_65x39_MX", "CBA_65x39_MX_XL"};
+        magazineWell[] += {"CBA_65x39_MX", "CBA_65x39_MX_XL"};
         class GL_3GL_F : UGL_F {
-            magazineWell[] = {"CBA_40mm_3GL", "CBA_40mm_M203", "CBA_40mm_EGLM"};
+            magazineWell[] += {"CBA_40mm_3GL", "CBA_40mm_M203", "CBA_40mm_EGLM"};
         };
     };
 
     class arifle_Katiba_Base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_65x39_Katiba"};
+        magazineWell[] += {"CBA_65x39_Katiba"};
     };
 
     class arifle_ARX_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_65x39_Katiba"};
+        magazineWell[] += {"CBA_65x39_Katiba"};
     };
 
     class EBR_base_F: Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x51_M14"};
+        magazineWell[] += {"CBA_762x51_M14"};
     };
     class DMR_03_base_F: Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x51_MkI_EMR"};
+        magazineWell[] += {"CBA_762x51_MkI_EMR"};
     };
     class DMR_06_base_F: Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x51_M14"};
+        magazineWell[] += {"CBA_762x51_M14"};
     };
     class arifle_SPAR_03_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_762x51_HK417", "CBA_762x51_HK417_L", "CBA_762x51_HK417_XL"};
+        magazineWell[] += {"CBA_762x51_HK417", "CBA_762x51_HK417_L", "CBA_762x51_HK417_XL"};
     };
 
     class DMR_01_base_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x54R_SVD"};
+        magazineWell[] += {"CBA_762x54R_SVD"};
     };
 
     class arifle_CTAR_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_580x42_TYPE95", "CBA_580x42_TYPE95_XL"};
+        magazineWell[] += {"CBA_580x42_TYPE95", "CBA_580x42_TYPE95_XL"};
     };
     class arifle_CTARS_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_580x42_TYPE95", "CBA_580x42_TYPE95_XL"};
+        magazineWell[] += {"CBA_580x42_TYPE95", "CBA_580x42_TYPE95_XL"};
     };
 
     class arifle_AK12_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_762x39_AK", "CBA_762x39_RPK"};
+        magazineWell[] += {"CBA_762x39_AK", "CBA_762x39_RPK"};
     };
     class arifle_AKM_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_762x39_AK", "CBA_762x39_RPK"};
+        magazineWell[] += {"CBA_762x39_AK", "CBA_762x39_RPK"};
     };
 
     class arifle_AKS_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_545x39_AK", "CBA_545x39_RPK"};
+        magazineWell[] += {"CBA_545x39_AK", "CBA_545x39_RPK"};
     };
 
     class LMG_03_base_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_556x45_MINIMI"};
+        magazineWell[] += {"CBA_556x45_MINIMI"};
     };
 
     class LMG_Mk200_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_65x39_Mk200"};
+        magazineWell[] += {"CBA_65x39_Mk200"};
     };
 
     class LMG_Zafir_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x54R_LINKS"};
+        magazineWell[] += {"CBA_762x54R_LINKS"};
     };
 
     class launch_RPG7_F : Launcher_Base_F {
-        magazineWell[] = {"CBA_RPG7"};
+        magazineWell[] += {"CBA_RPG7"};
     };
 
     class MMG_01_base_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_93x64_LINKS"};
+        magazineWell[] += {"CBA_93x64_LINKS"};
     };
 
     class MMG_02_base_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_338NM_LINKS"};
+        magazineWell[] += {"CBA_338NM_LINKS"};
     };
 };

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_545x39.hpp

@@ -1,4 +1,4 @@
-    class CBA_545x39_AK {       // Standard AK-74 magazines
+    class CBA_545x39_AK {       //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "30Rnd_545x39_Mag_F",
             "30Rnd_545x39_Mag_Green_F",
@@ -7,4 +7,6 @@
         };
     };
 
+    class AK_545x39 {};         // Standard AK-74 magazines
+
     class CBA_545x39_RPK {};    // 45rnd RPK-74

addons/jam/magwells_556x45.hpp

@@ -13,11 +13,14 @@
         };
     };
 
+    class M249_556x45 {};
+
     class CBA_556x45_TYPE97 {};         // QBZ-97 Stick Mags
     class CBA_556x45_TYPE97_XL {};      // QBB-97 LSW Drums
     class CBA_556x45_SG550 {};
 
-    class CBA_556x45_STANAG {           // STANAG mags, standard length, including small drums
+
+    class CBA_556x45_STANAG {           //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "30Rnd_556x45_Stanag",
             "30Rnd_556x45_Stanag_green",
@@ -28,7 +31,11 @@
         };
     };
 
-    class CBA_556x45_STANAG_L {};       // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)
+    class CBA_556x45_STANAG_L {};       //This is DEPRECATED! Don't use it! Use the vanilla one instead
+
+    class STANAG_556x45 {};         // STANAG mags, standard length, including small drums
+
+    class STANAG_556x45_Large {};       // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)
     class CBA_556x45_STANAG_XL {};      // STANAG mags, extra long stick or coffin (80/100 rounds, Surefire MAG5-100)
     class CBA_556x45_STANAG_2D {};      // STANAG mags, twin drums (100rnd Beta C-MAG)
     class CBA_556x45_STANAG_2D_XL {     // STANAG mags, extra large twin-drums (150rnd Armatac SAW-MAG)

addons/jam/magwells_580x42.hpp

@@ -1,13 +1,19 @@
-    class CBA_580x42_TYPE95 {           // QBZ-95 Stick Mags
+    class CBA_580x42_TYPE95 {           //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "30Rnd_580x42_Mag_F",
             "30Rnd_580x42_Mag_Tracer_F"
         };
     };
 
-    class CBA_580x42_TYPE95_XL {        // QBB-95 LSW Drums
+    class CBA_580x42_TYPE95_XL {        //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_drums[] = {
             "100Rnd_580x42_Mag_F",
             "100Rnd_580x42_Mag_Tracer_F"
         };
     };
+
+
+    class CTAR_580x42 {};           // QBZ-95 Stick Mags
+
+    class CTAR_580x42_Large {};       // QBB-95 LSW Drums
+

addons/jam/magwells_65x39.hpp

@@ -1,28 +1,37 @@
-    class CBA_65x39_MX {
+    class CBA_65x39_MX { //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "30Rnd_65x39_caseless_mag",
             "30Rnd_65x39_caseless_green",
             "30Rnd_65x39_caseless_mag_Tracer",
             "30Rnd_65x39_caseless_green_mag_Tracer"
         };
     };
+
+
+    class MX_65x39 {};
+
     class CBA_65x39_MX_XL {
         BI_mags[] = {
             "100Rnd_65x39_caseless_mag",
             "100Rnd_65x39_caseless_mag_Tracer"
         };
     };
 
-    class CBA_65x39_Mk200 {
+
+    class CBA_65x39_Mk200 { //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "200Rnd_65x39_cased_Box",
             "200Rnd_65x39_cased_Box_Tracer"
         };
     };
 
-    class CBA_65x39_Katiba {
+    class CBA_65x39_Katiba { //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "30Rnd_65x39_caseless_green",
             "30Rnd_65x39_caseless_green_mag_Tracer"
         };
     };
+
+    class Mk200_65x39 {};
+
+    class Katiba_65x39 {};

addons/jam/magwells_762x39.hpp

@@ -1,4 +1,4 @@
-    class CBA_762x39_AK {               // Standard AK-47/AKM magazines
+    class CBA_762x39_AK {               //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "30Rnd_762x39_Mag_F",
             "30Rnd_762x39_Mag_Green_F",
@@ -7,6 +7,8 @@
         };
     };
 
+    class AK_762x39 {};                 // Standard AK-47/AKM magazines
+
     class CBA_762x39_RPK {};            // 40/45/75rnd RPK magazines
 
     class CBA_762x39_STANAG {};         // 762x39mm in a normal length STANAG mag, including small drums