Merge branch 'master' into fix-S4

Theseus-Aegis · Jun 15, 2024 · 05401c9 · 05401c9
2 parents 6b2d712 + feef09a
commit 05401c9
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 21 deletions.
diff --git a/addons/ammunition/CfgAmmo.hpp b/addons/ammunition/CfgAmmo.hpp
@@ -63,7 +63,6 @@ class CfgAmmo {
     };
 
     // 9x19mm
-    class B_9x21_Ball_Tracer_Yellow;
     class CLASS(9x19_Ball): B_9x21_Ball_Tracer_Yellow {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.1;

diff --git a/addons/ammunition/bi/45ACP.hpp b/addons/ammunition/bi/45ACP.hpp
@@ -1,5 +1,4 @@
 // .45ACP FNX-45
-class 11Rnd_45ACP_Mag;
 class CLASS(15Rnd_45ACP_FNX45_Ball): 11Rnd_45ACP_Mag {
     MACRO_SCOPE;
     ammo = QCLASS(45ACP_Ball);

diff --git a/addons/ammunition/bi/9x19.hpp b/addons/ammunition/bi/9x19.hpp
@@ -1,4 +1,3 @@
-class 16Rnd_9x21_Mag;
 class CLASS(17Rnd_9x19mm_Walther_Ball): 16Rnd_9x21_Mag {
     MACRO_SCOPE;
     ammo = QCLASS(9x19_Ball);

diff --git a/addons/ammunition/cup/magazines/45ACP.hpp b/addons/ammunition/cup/magazines/45ACP.hpp
@@ -1,5 +1,4 @@
 // .45ACP 1911
-class CUP_7Rnd_45ACP_1911;
 class CLASS(8Rnd_45ACP_1911_Ball): CUP_7Rnd_45ACP_1911 {
     MACRO_SCOPE;
     ammo = QCLASS(45ACP_Ball);
@@ -9,7 +8,6 @@ class CLASS(8Rnd_45ACP_1911_Ball): CUP_7Rnd_45ACP_1911 {
 };
 
 // .45ACP MK23 SOCOM
-class CUP_12Rnd_45ACP_mk23;
 class CLASS(12Rnd_45ACP_MK23_Ball): CUP_12Rnd_45ACP_mk23 {
     MACRO_SCOPE;
     ammo = QCLASS(45ACP_Ball);

diff --git a/addons/ammunition/cup/magazines/9x19.hpp b/addons/ammunition/cup/magazines/9x19.hpp
@@ -1,5 +1,4 @@
 // 9x19 Browning
-class CUP_13Rnd_9x19_Browning_HP;
 class CLASS(13Rnd_9x19_Browning_Ball): CUP_13Rnd_9x19_Browning_HP {
     MACRO_SCOPE;
     ammo = QCLASS(9x19_Ball);
@@ -9,7 +8,6 @@ class CLASS(13Rnd_9x19_Browning_Ball): CUP_13Rnd_9x19_Browning_HP {
 };
 
 // 9x19 CZ75
-class CUP_18Rnd_9x19_Phantom;
 class CLASS(18Rnd_9x19_CZ75_Ball): CUP_18Rnd_9x19_Phantom {
     MACRO_SCOPE;
     ammo = QCLASS(9x19_Ball);
@@ -19,7 +17,6 @@ class CLASS(18Rnd_9x19_CZ75_Ball): CUP_18Rnd_9x19_Phantom {
 };
 
 // 9x19 Glock
-class CUP_17Rnd_9x19_glock17;
 class CLASS(17Rnd_9x19_Glock_Ball): CUP_17Rnd_9x19_glock17 {
     MACRO_SCOPE;
     ammo = QCLASS(9x19_Ball);
@@ -29,7 +26,6 @@ class CLASS(17Rnd_9x19_Glock_Ball): CUP_17Rnd_9x19_glock17 {
 };
 
 // 9x19 M17
-class CUP_17Rnd_9x19_M17_Black;
 class CLASS(17Rnd_9x19_M17_Ball): CUP_17Rnd_9x19_M17_Black {
     MACRO_SCOPE;
     ammo = QCLASS(9x19_Ball);
@@ -39,7 +35,6 @@ class CLASS(17Rnd_9x19_M17_Ball): CUP_17Rnd_9x19_M17_Black {
 };
 
 // 9x19 M9
-class CUP_15Rnd_9x19_M9;
 class CLASS(15Rnd_9x19_M9_Ball): CUP_15Rnd_9x19_M9 {
     MACRO_SCOPE;
     ammo = QCLASS(9x19_Ball);

diff --git a/addons/ammunition/niarms/magazines/357.hpp b/addons/ammunition/niarms/magazines/357.hpp
@@ -1,5 +1,4 @@
 // .357 SIG
-class hlc_12Rnd_357SIG_B_P226;
 class CLASS(12Rnd_357_P226_Magnum): hlc_12Rnd_357SIG_B_P226 {
     MACRO_SCOPE;
     ammo = QCLASS(357_Magnum);
@@ -8,7 +7,6 @@ class CLASS(12Rnd_357_P226_Magnum): hlc_12Rnd_357SIG_B_P226 {
     lastRoundsTracer = 2;
 };
 
-class hlc_8Rnd_357SIG_B_P239;
 class CLASS(8Rnd_357_P239_Magnum): hlc_8Rnd_357SIG_B_P239 {
     MACRO_SCOPE;
     ammo = QCLASS(357_Magnum);

diff --git a/addons/ammunition/niarms/magazines/9x19.hpp b/addons/ammunition/niarms/magazines/9x19.hpp
@@ -1,5 +1,4 @@
 // 9x19 SIG
-class hlc_15Rnd_9x19_B_P226;
 class CLASS(15Rnd_9x19_P226_Ball): hlc_15Rnd_9x19_B_P226 {
     MACRO_SCOPE;
     ammo = QCLASS(9x19_Ball);
@@ -9,7 +8,6 @@ class CLASS(15Rnd_9x19_P226_Ball): hlc_15Rnd_9x19_B_P226 {
 };
 
 // 9x19 SIG P239
-class hlc_10Rnd_9x19_B_P239;
 class CLASS(10Rnd_9x19_P239_Ball): hlc_10Rnd_9x19_B_P239 {
     MACRO_SCOPE;
     ammo = QCLASS(9x19_Ball);

diff --git a/addons/hidden_units/CfgVehicles_Baseclasses.hpp b/addons/hidden_units/CfgVehicles_Baseclasses.hpp
@@ -19,15 +19,13 @@ class O_Truck_03_medical_F;
 // Units
 class B_ghillie_lsh_F;
 class CUP_B_AFU_M14_Soldier_01;
-class CUP_B_AFU_M14_Soldier_01;
 class CUP_B_AFU_M14_Soldier_02;
 class CUP_B_AFU_M14_Soldier_05;
 class CUP_B_AFU_M14_Soldier_07;
 class CUP_B_AFU_M14_Soldier_08;
 class CUP_B_AFU_M14_Soldier_09;
 class CUP_B_CDF_Soldier_01_DST;
 class CUP_B_CDF_Soldier_01_FST;
-class CUP_B_CDF_Soldier_01_FST;
 class CUP_B_CDF_Soldier_01_MNT;
 class CUP_B_CDF_Soldier_01_SNW;
 class CUP_B_CDF_Soldier_02_DST;
@@ -37,7 +35,6 @@ class CUP_B_CDF_Soldier_02_SNW;
 class CUP_B_CZ_Soldier_02;
 class CUP_B_CZ_Soldier_08;
 class CUP_B_CZ_Soldier_11;
-class CUP_B_CZ_Soldier_11;
 class CUP_B_CZ_Soldier_DST_Base;
 class CUP_B_CZ_Soldier_WDL_Base;
 class CUP_B_CZ_SpecOp_DST_Base;
@@ -72,7 +69,6 @@ class CUP_B_USArmy_Soldier_06;
 class CUP_B_USArmy_Soldier_BDUv2_gloves_M81;
 class CUP_B_USArmy_UCP_Soldier_01;
 class CUP_B_USArmy_UCP_Soldier_02;
-class CUP_B_USArmy_UCP_Soldier_02;
 class CUP_B_USArmy_UCP_Soldier_03;
 class CUP_B_USArmy_UCP_Soldier_05;
 class CUP_B_USArmy_UCP_Soldier_07;
@@ -89,7 +85,6 @@ class CUP_B_USMC_Soldier_02;
 class CUP_B_USMC_Soldier_03;
 class CUP_B_USMC_Soldier_05;
 class CUP_B_USMC_Soldier_06;
-class CUP_B_USMC_Soldier_06;
 class CUP_B_USMC_Soldier_07;
 class CUP_B_USMC_Soldier_08;
 class CUP_B_USNavy_LHD_Crew_base_Blue;

diff --git a/addons/hidden_units/ws/baseclasses.hpp b/addons/hidden_units/ws/baseclasses.hpp
@@ -94,6 +94,5 @@ class B_Truck_01_transport_F;
 class B_Truck_01_covered_F;
 class B_MRAP_01_F;
 class Offroad_01_base_lxWS;
-class Offroad_01_armor_base_lxWS;
 class Heli_Transport_02_base_F;
 class I_MBT_03_cannon_F;
diff --git a/addons/recoils/bohemia/baseclasses.hpp b/addons/recoils/bohemia/baseclasses.hpp
@@ -27,7 +27,6 @@ class arifle_MSBS65_UBS_base_sand_F;
 class arifle_MX_Base_F;
 class arifle_RPK12_base_F;
 class arifle_SPAR_01_base_F;
-class arifle_SPAR_01_base_F;
 class arifle_SPAR_01_GL_base_F;
 class arifle_SPAR_02_base_F;
 class arifle_SPAR_03_base_F;