From 0630ebd93a40b25e096ad639ee94f2a1ebb2f447 Mon Sep 17 00:00:00 2001
From: xrufix <stefan@ruhfass.com>
Date: Wed, 6 Dec 2017 17:24:41 +0100
Subject: [PATCH] Fix missing HE magazine for Blackfish Autocannon. (#5854)

* Fix missing HE magazine for Blackfish Autocannon.

* Change displayname of Blackfish autocannon to "L/60 Bofors"

* Remove muzzle tweak from autocannons.
---
 addons/realisticnames/CfgWeapons.hpp | 10 ++++++++++
 addons/vehicles/CfgWeapons.hpp       | 18 ------------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/addons/realisticnames/CfgWeapons.hpp b/addons/realisticnames/CfgWeapons.hpp
index 5e0032f780..585f18f4ee 100644
--- a/addons/realisticnames/CfgWeapons.hpp
+++ b/addons/realisticnames/CfgWeapons.hpp
@@ -546,6 +546,16 @@ class CfgWeapons {
         };
     };
 
+    class autocannon_40mm_VTOL_01: autocannon_40mm_CTWS {
+        displayName = "L/60 Bofors Autocannon";
+        class AP: AP {
+            displayName = "L/60 Bofors Autocannon";
+        };
+        class HE: AP {
+            displayName = "L/60 Bofors Autocannon";
+        };
+    };
+
     class autocannon_30mm_CTWS: autocannon_Base_F {
         displayName = "Mk44 Bushmaster II";
         class AP: autocannon_Base_F {
diff --git a/addons/vehicles/CfgWeapons.hpp b/addons/vehicles/CfgWeapons.hpp
index 78a82abccf..530a6913c7 100644
--- a/addons/vehicles/CfgWeapons.hpp
+++ b/addons/vehicles/CfgWeapons.hpp
@@ -46,24 +46,6 @@ class CfgWeapons {
         class far: close {};
     };
 
-    class autocannon_Base_F;
-    class autocannon_30mm_CTWS: autocannon_Base_F {
-        class AP: autocannon_Base_F {
-            magazines[] = {"60Rnd_30mm_APFSDS_shells","60Rnd_30mm_APFSDS_shells_Tracer_Red","60Rnd_30mm_APFSDS_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Yellow","140Rnd_30mm_MP_shells","140Rnd_30mm_MP_shells_Tracer_Red","140Rnd_30mm_MP_shells_Tracer_Green","140Rnd_30mm_MP_shells_Tracer_Yellow"};
-            magazineReloadTime = 0;
-        };
-
-        muzzles[] = {"AP"};
-    };
-    class autocannon_40mm_CTWS: autocannon_Base_F {
-        class AP: autocannon_Base_F {
-            magazines[] = {"40Rnd_40mm_APFSDS_shells","40Rnd_40mm_APFSDS_Tracer_Red_shells","40Rnd_40mm_APFSDS_Tracer_Green_shells","40Rnd_40mm_APFSDS_Tracer_Yellow_shells","60Rnd_40mm_GPR_shells","60Rnd_40mm_GPR_Tracer_Red_shells","60Rnd_40mm_GPR_Tracer_Green_shells","60Rnd_40mm_GPR_Tracer_Yellow_shells"};
-            magazineReloadTime = 0;
-        };
-
-        muzzles[] = {"AP"};
-    };
-
     // make static weapons compatible with 100rnd mag variants
     class HMG_static: HMG_01 {
         magazines[] = {"500Rnd_127x99_mag","500Rnd_127x99_mag_Tracer_Red","500Rnd_127x99_mag_Tracer_Green","500Rnd_127x99_mag_Tracer_Yellow","200Rnd_127x99_mag","200Rnd_127x99_mag_Tracer_Red","200Rnd_127x99_mag_Tracer_Green","200Rnd_127x99_mag_Tracer_Yellow","100Rnd_127x99_mag","100Rnd_127x99_mag_Tracer_Red","100Rnd_127x99_mag_Tracer_Green","100Rnd_127x99_mag_Tracer_Yellow"};