From c7890cd881cdd30e00d319f16343988935cae786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 24 Mar 2022 00:00:27 +0100 Subject: [PATCH 1/9] Add CSLA magazines to CBA magazine wells --- addons/jam/CfgMagazineWells.hpp | 15 ++++++++++++++- addons/jam/magwells_12gauge.hpp | 12 ++++++++++-- addons/jam/magwells_32ACP.hpp | 7 ++++++- addons/jam/magwells_40mm.hpp | 3 +++ addons/jam/magwells_45ACP.hpp | 3 +++ addons/jam/magwells_556x45.hpp | 6 ++++++ addons/jam/magwells_762x25.hpp | 7 ++++++- addons/jam/magwells_762x39.hpp | 5 +++++ addons/jam/magwells_762x51.hpp | 11 ++++++++++- addons/jam/magwells_762x54.hpp | 15 ++++++++++++++- addons/jam/magwells_9x18.hpp | 7 ++++++- addons/jam/magwells_9x19.hpp | 9 ++++++++- 12 files changed, 91 insertions(+), 9 deletions(-) diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index b6ebc00e81..c0b80778e7 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -78,7 +78,12 @@ class CfgMagazineWells { class CBA_Bazooka {}; // M1, M1A1 Bazooka class CBA_Panzerschreck {}; // Panzerschreck RPzB 54 class CBA_PIAT {}; // PIAT - class CBA_SMAW {}; // Mk 153 Shoulder-Launched Multipurpose Assault Weapon + class CBA_SMAW { // Mk 153 Shoulder-Launched Multipurpose Assault Weapon + CSLA_rounds[] = { + "US85_SMAW_HEAA", + "US85_SMAW_HEDP" + }; + }; class CBA_SMAW_Spotting_Rifle {}; // Mk 153 Shoulder-Launched Multipurpose Assault Weapon - Spotting Rifle class CBA_Carl_Gustaf { // MAAWS, RAWS @@ -86,11 +91,19 @@ class CfgMagazineWells { "MRAWS_HEAT_F", "MRAWS_HE_F" }; + CSLA_rounds[] = { + "US85_MAAWS_HEAT", + "US85_MAAWS_HEDP" + }; }; class CBA_RPG7 { BI_rockets[] = { "RPG7_F" }; + CSLA_rockets[] = { + "CSLA_PG7M110", + "CSLA_PG7M110V" + }; }; }; diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp index eb4cb837c0..b2534fc6ac 100644 --- a/addons/jam/magwells_12gauge.hpp +++ b/addons/jam/magwells_12gauge.hpp @@ -1,12 +1,20 @@ class CBA_12g_9rnds {}; // 9 loose rounds - class CBA_12g_8rnds {}; // 8 loose rounds + class CBA_12g_8rnds { // 8 loose rounds + CSLA_rounds[] = { + "US85_8Rnd_12GaugeSlug" + }; + }; class CBA_12g_7rnds {}; // 7 loose rounds class CBA_12g_6rnds {}; // 6 loose rounds class CBA_12g_5rnds {}; // 5 loose rounds class CBA_12g_4rnds {}; // 4 loose rounds class CBA_12g_3rnds {}; // 3 loose rounds class CBA_12g_2rnds {}; // 2 loose rounds - class CBA_12g_1rnd {}; // 1 loose round + class CBA_12g_1rnd { // 1 loose round + CSLA_rounds[] = { + "US85_12GaugeSlug" + }; + }; class CBA_12g_AA12 {}; // AA-12 Stick Magazines class CBA_12g_AA12_XL {}; // AA-12 Drum Magazines diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp index 468a1451b0..ef5e1e23d1 100644 --- a/addons/jam/magwells_32ACP.hpp +++ b/addons/jam/magwells_32ACP.hpp @@ -5,5 +5,10 @@ class CBA_32ACP_PP {}; // Walther PP in .32 ACP (7.65x17mm Browning) class CBA_32ACP_PPK {}; // Walther PPK in .32 ACP (7.65x17mm Browning) class CBA_32ACP_Vz27 {}; // vz. 27 - class CBA_32ACP_Vz61 {}; // Škorpion (vz. 61), M84 + class CBA_32ACP_Vz61 { // Škorpion (vz. 61), M84 + CSLA_mags[] = { + "CSLA_Sa61_20rnd_7_65Pi27", + "CSLA_Sa61_20rnd_7_65PiCv27" + }; + }; class CBA_32ACP_Welrod {}; // Welrod MkII in .32 ACP (7.65x17mm Browning) diff --git a/addons/jam/magwells_40mm.hpp b/addons/jam/magwells_40mm.hpp index 1c2f043699..7868381ec7 100644 --- a/addons/jam/magwells_40mm.hpp +++ b/addons/jam/magwells_40mm.hpp @@ -36,5 +36,8 @@ "UGL_FlareYellow_F", "UGL_FlareCIR_F" }; + CSLA_grenades[] = { + "US85_1Rnd_HE" + }; }; class CBA_40mm_M203_6rnds {}; // 6 loose M203 type grenades for M32 MGL diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp index 64a85bdad7..bf99240aa2 100644 --- a/addons/jam/magwells_45ACP.hpp +++ b/addons/jam/magwells_45ACP.hpp @@ -2,6 +2,9 @@ BI_mags[] = { "9Rnd_45ACP_Mag" }; + CSLA_mags[] = { + "US85_1911_7Rnd_045ACP" + }; }; class CBA_45ACP_C96 {}; // Mauser C-96 in .45 ACP class CBA_9x19_CZ97 {}; // CZ 97 in .45 ACP diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp index 06301bd027..67e3f1de67 100644 --- a/addons/jam/magwells_556x45.hpp +++ b/addons/jam/magwells_556x45.hpp @@ -13,6 +13,9 @@ "200Rnd_556x45_Box_Tracer_F", "200Rnd_556x45_Box_Tracer_Red_F" }; + CSLA_boxes[] = { + "US85_200Rnd_556x45" + }; }; class CBA_556x45_TYPE97 {}; // QBZ-97 Stick Mags @@ -50,6 +53,9 @@ "30Rnd_556x45_Stanag_Sand_Tracer_Green", "30Rnd_556x45_Stanag_Sand_Tracer_Yellow" }; + CSLA_mags[] = { + "US85_30Rnd_556x45" + }; }; class CBA_556x45_STANAG_L {}; // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60) diff --git a/addons/jam/magwells_762x25.hpp b/addons/jam/magwells_762x25.hpp index 0e2e2dfaa4..c73414b9c6 100644 --- a/addons/jam/magwells_762x25.hpp +++ b/addons/jam/magwells_762x25.hpp @@ -7,4 +7,9 @@ class CBA_762x25_PPS {}; // PPS-43 class CBA_762x25_PPSh_Drum {}; // PPSh-41 drum magazines class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines - class CBA_762x25_TT {}; // TT-30, TT-33 Tokarev + class CBA_762x25_TT { // TT-30, TT-33 Tokarev + CSLA_mags[] = { + "CSLA_Pi52_8rnd_7_62Pi52", + "CSLA_Pi52_8rnd_7_62PiCv52" + }; + }; diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp index 7cec850954..c25ea7b523 100644 --- a/addons/jam/magwells_762x39.hpp +++ b/addons/jam/magwells_762x39.hpp @@ -5,6 +5,11 @@ "30Rnd_762x39_Mag_Tracer_F", "30Rnd_762x39_Mag_Tracer_Green_F" }; + CSLA_mags[] = { + "CSLA_Sa58_30rnd_7_62Cv43", + "CSLA_Sa58_30rnd_7_62Sv43", + "CSLA_Sa58_30rnd_7_62vz43" + }; }; class CBA_762x39_CZ807 {}; // 762x39mm CZ 807 magazines diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp index 9e079e2bc8..38f627a9c4 100644 --- a/addons/jam/magwells_762x51.hpp +++ b/addons/jam/magwells_762x51.hpp @@ -4,7 +4,11 @@ class CBA_762x51_4rnds {}; // 4 loose rounds of 7.62x51mm NATO class CBA_762x51_5rnds {}; // 5 loose rounds of 7.62x51mm NATO - class CBA_762x51_AICS {}; // AICS short action mag (5/10 rounds) + class CBA_762x51_AICS { // AICS short action mag (5/10 rounds) + CSLA_mags[] = { + "US85_10Rnd_762x51" + }; + }; class CBA_762x51_AR10 {}; // AR-10 standard mag (20 rounds) class CBA_762x51_AR10_L {}; // AR-10 long mag (25/30 rounds) @@ -31,6 +35,11 @@ "150Rnd_762x51_Box", "150Rnd_762x51_Box_Tracer" }; + CSLA_belts[] = { + "US85_50Rnd_762x51", + "US85_100Rnd_762x51", + "US85_200Rnd_762x51" + }; }; class CBA_762x51_M14 {}; // M14 diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp index 8dd9752e67..2767d87cfe 100644 --- a/addons/jam/magwells_762x54.hpp +++ b/addons/jam/magwells_762x54.hpp @@ -17,8 +17,21 @@ BI_mags[] = { "10Rnd_762x54_Mag" }; + CSLA_mags[] = { + "CSLA_OP63_10rnd_7_62Odst59", + "CSLA_OP63_10rnd_7_62Cv59" + }; }; class CBA_762x54R_SVT {}; // SVT-38, SVT-40 - class CBA_762x54R_Vz59_LINKS {}; //Uk vz. 59, UK59, vz 59 + class CBA_762x54R_Vz59_LINKS { //Uk vz. 59, UK59, vz 59 + CSLA_belts[] = { + "CSLA_UK59_50rnd_7_62Cv59", + "CSLA_UK59_50rnd_7_62PZ59", + "CSLA_UK59_50rnd_7_62Sv59", + "CSLA_UK59_50rnd_7_62Tz59", + "CSLA_UK59_50rnd_7_62TzSv59", + "CSLA_UK59_50rnd_7_62vz59" + }; + }; diff --git a/addons/jam/magwells_9x18.hpp b/addons/jam/magwells_9x18.hpp index 7331db9c1a..57eb933d61 100644 --- a/addons/jam/magwells_9x18.hpp +++ b/addons/jam/magwells_9x18.hpp @@ -1,5 +1,10 @@ class CBA_9x18_APS {}; // Stechkin automatic pistol (APS) - class CBA_9x18_CZ82 {}; // CZ 82, CZ 83 + class CBA_9x18_CZ82 { // CZ 82, CZ 83 + CSLA_mags[] = { + "CSLA_Pi82_12rnd_9Pi82", + "CSLA_Pi82_12rnd_9PiCv82" + }; + }; class CBA_9x18_Fort12 {}; // Fort-12 class CBA_9x18_GPP9M {}; // Grand Power K100 P9M class CBA_9x18_Ots01 {}; // OTs-01 Kobalt diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp index 6299e77d68..6616219643 100644 --- a/addons/jam/magwells_9x19.hpp +++ b/addons/jam/magwells_9x19.hpp @@ -13,7 +13,11 @@ class CBA_9x19_Glock_Cpct {}; // Compact Glock in 9x19mm (Glock 19, 46) class CBA_9x19_Glock_Full {}; // Fullsize Glock in 9x19mm (Glock 17, 18, 34, 45) class CBA_9x19_HiPower {}; // Browning HiPower - class CBA_9x19_M9 {}; // Beretta M9 + class CBA_9x19_M9 { // Beretta M9 + CSLA_mags[] = { + "US85_M9_15Rnd_9Luger" + }; + }; class CBA_9x19_MAB38 {}; // Beretta Model 38 class CBA_9x19_MP28 {}; // MP18 Straight Magazines, MP28, MP35 class CBA_9x19_MP40 {}; // MP40, MP38 @@ -25,6 +29,9 @@ "30Rnd_9x21_Mag_SMG_02_Tracer_Yellow", "30Rnd_9x21_Mag_SMG_02_Tracer_Green" }; + CSLA_mags[] = { + "US85_MPV_30Rnd_9Luger" + }; }; class CBA_9x19_Ots27 {}; // OTs-27 Berdysh class CBA_9x19_P08 {}; // Luger P08, MP18 From cc629beceeabc960cca4aa6e14683817c7f911fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 24 Mar 2022 00:40:28 +0100 Subject: [PATCH 2/9] Add CBA magazine wells to CSLA weapons --- addons/jam/CfgWeapons.hpp | 2 + addons/jam/CfgWeapons_CSLA.hpp | 87 ++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 addons/jam/CfgWeapons_CSLA.hpp diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp index 90d4dc88e7..d0f9c71fa5 100644 --- a/addons/jam/CfgWeapons.hpp +++ b/addons/jam/CfgWeapons.hpp @@ -128,4 +128,6 @@ class CfgWeapons { class hgun_ACPC2_F: Pistol_Base_F { magazineWell[] += {"CBA_45ACP_1911"}; }; + + #include "CfgWeapons_CSLA.hpp" }; diff --git a/addons/jam/CfgWeapons_CSLA.hpp b/addons/jam/CfgWeapons_CSLA.hpp new file mode 100644 index 0000000000..2b8a700226 --- /dev/null +++ b/addons/jam/CfgWeapons_CSLA.hpp @@ -0,0 +1,87 @@ +class CSLA_baseWeapon: Rifle_Base_F {}; + +class CSLA_OP63_Base: CSLA_baseWeapon { + magazineWell += {"CBA_762x54R_SVD"}; +}; + +class CSLA_rSa61: CSLA_baseWeapon { + magazineWell += {"CBA_32ACP_Vz61"}; +}; + +class CSLA_Sa58_Base: CSLA_baseWeapon { + magazineWell += {"CBA_762x39_AK"}; +}; + +class CSLA_MachinegunBase_5_56: CSLA_baseWeapon {}; + +class CSLA_MachinegunBase_7_62: CSLA_MachinegunBase_5_56 {}; + +class CSLA_UK59L: CSLA_MachinegunBase_7_62 { + magazineWell += {"CBA_762x54R_Vz59_LINKS"}; +}; + +class CSLA_PistolBase: Pistol_Base_F {}; + +class CSLA_Pi52: CSLA_PistolBase { + magazineWell[] += {"CBA_762x25_TT"}; +}; + +class CSLA_Pi82: CSLA_Pi52 { + magazineWell[] += {"CBA_9x18_CZ82"}; +}; + +class CSLA_Sa61: CSLA_Pi52 { + magazineWell += {"CBA_32ACP_Vz61"}; +}; + +class CSLA_LauncherBase: Launcher_Base_F {}; + +class CSLA_RPG7: CSLA_LauncherBase { + magazineWell[] += {"CBA_RPG7"}; +}; + +class US85_weaponBase: Rifle_Base_F {}; + +class US85_FAL_BASE: US85_weaponBase { + magazineWell[] += {"CBA_762x51_FAL", "CBA_762x51_FAL_L"}; +}; + +class US85_M16_base: US85_weaponBase { + magazineWell[] += {"CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"}; +}; + +class US85_M21_Base: US85_weaponBase { + magazineWell[] += {"CBA_762x51_M14", "CBA_762x51_M14_L"}; +}; + +class US85_MPV_BASE: US85_weaponBase { + magazineWell[] += {"CBA_9x19_MP5"}; +}; + +class US85_MachinegunBase_5_56: US85_weaponBase {}; + +class US85_M249: US85_MachinegunBase_5_56 { + magazineWell[] += {"CBA_556x45_MINIMI"}; +}; + +class US85_MachinegunBase_7_62: US85_MachinegunBase_5_56 {}; + +class US85_M60: US85_MachinegunBase_7_62 { + magazineWell[] += {"CBA_762x51_LINKS"}; +}; + +class US85_pistolBase: Pistol_Base_F {}; + +class US85_1911 { + magazineWell[] += {"CBA_45ACP_1911"}; +}; + +class US85_M9: US85_pistolBase { + magazineWell[] += {"CBA_9x19_M9"}; +}; + +class US85_launcherBase: Launcher_Base_F {}; + +class US85_MAAWS: US85_launcherBase { + magazineWell[] += {"CBA_Carl_Gustaf"}; +}; From b5d8568f53d9f76ede0a182cee845c7d54410f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 24 Mar 2022 01:02:17 +0100 Subject: [PATCH 3/9] Fix missing array brackets --- addons/jam/CfgWeapons_CSLA.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/jam/CfgWeapons_CSLA.hpp b/addons/jam/CfgWeapons_CSLA.hpp index 2b8a700226..96d5bb3186 100644 --- a/addons/jam/CfgWeapons_CSLA.hpp +++ b/addons/jam/CfgWeapons_CSLA.hpp @@ -1,15 +1,15 @@ class CSLA_baseWeapon: Rifle_Base_F {}; class CSLA_OP63_Base: CSLA_baseWeapon { - magazineWell += {"CBA_762x54R_SVD"}; + magazineWell[] += {"CBA_762x54R_SVD"}; }; class CSLA_rSa61: CSLA_baseWeapon { - magazineWell += {"CBA_32ACP_Vz61"}; + magazineWell[] += {"CBA_32ACP_Vz61"}; }; class CSLA_Sa58_Base: CSLA_baseWeapon { - magazineWell += {"CBA_762x39_AK"}; + magazineWell[] += {"CBA_762x39_AK"}; }; class CSLA_MachinegunBase_5_56: CSLA_baseWeapon {}; @@ -17,7 +17,7 @@ class CSLA_MachinegunBase_5_56: CSLA_baseWeapon {}; class CSLA_MachinegunBase_7_62: CSLA_MachinegunBase_5_56 {}; class CSLA_UK59L: CSLA_MachinegunBase_7_62 { - magazineWell += {"CBA_762x54R_Vz59_LINKS"}; + magazineWell[] += {"CBA_762x54R_Vz59_LINKS"}; }; class CSLA_PistolBase: Pistol_Base_F {}; @@ -31,7 +31,7 @@ class CSLA_Pi82: CSLA_Pi52 { }; class CSLA_Sa61: CSLA_Pi52 { - magazineWell += {"CBA_32ACP_Vz61"}; + magazineWell[] += {"CBA_32ACP_Vz61"}; }; class CSLA_LauncherBase: Launcher_Base_F {}; From f9597346c3eda92833b0dcfb0233952e4d23d787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 7 Sep 2023 20:31:28 +0200 Subject: [PATCH 4/9] jam_csla --- addons/jam/jam_csla/config.cpp | 19 +++++++++++++++++++ addons/jam/jam_csla/script_component.hpp | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 addons/jam/jam_csla/config.cpp create mode 100644 addons/jam/jam_csla/script_component.hpp diff --git a/addons/jam/jam_csla/config.cpp b/addons/jam/jam_csla/config.cpp new file mode 100644 index 0000000000..715ebac432 --- /dev/null +++ b/addons/jam/jam_csla/config.cpp @@ -0,0 +1,19 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + name = ECSTRING(jam,component); + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "cba_jam", + "CSLA" + }; + author = "$STR_CBA_Author"; + authors[] = {}; + url = "$STR_CBA_URL"; + skipWhenMissingDependencies = 1; + VERSION_CONFIG; + }; +}; \ No newline at end of file diff --git a/addons/jam/jam_csla/script_component.hpp b/addons/jam/jam_csla/script_component.hpp new file mode 100644 index 0000000000..4b873e601a --- /dev/null +++ b/addons/jam/jam_csla/script_component.hpp @@ -0,0 +1,3 @@ +#define COMPONENT jam_csla +#include "\x\cba\addons\main\script_mod.hpp" +#include "\x\cba\addons\main\script_macros.hpp" From a8648195b86f9e57d51e7d311a7b05c8d7fc5922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 7 Sep 2023 20:37:42 +0200 Subject: [PATCH 5/9] Move CfgWeapons to jam_csla --- addons/jam/CfgWeapons_CSLA.hpp | 87 ---------------------------- addons/jam/jam_csla/CfgWeapons.hpp | 91 ++++++++++++++++++++++++++++++ addons/jam/jam_csla/config.cpp | 4 +- 3 files changed, 94 insertions(+), 88 deletions(-) delete mode 100644 addons/jam/CfgWeapons_CSLA.hpp create mode 100644 addons/jam/jam_csla/CfgWeapons.hpp diff --git a/addons/jam/CfgWeapons_CSLA.hpp b/addons/jam/CfgWeapons_CSLA.hpp deleted file mode 100644 index 96d5bb3186..0000000000 --- a/addons/jam/CfgWeapons_CSLA.hpp +++ /dev/null @@ -1,87 +0,0 @@ -class CSLA_baseWeapon: Rifle_Base_F {}; - -class CSLA_OP63_Base: CSLA_baseWeapon { - magazineWell[] += {"CBA_762x54R_SVD"}; -}; - -class CSLA_rSa61: CSLA_baseWeapon { - magazineWell[] += {"CBA_32ACP_Vz61"}; -}; - -class CSLA_Sa58_Base: CSLA_baseWeapon { - magazineWell[] += {"CBA_762x39_AK"}; -}; - -class CSLA_MachinegunBase_5_56: CSLA_baseWeapon {}; - -class CSLA_MachinegunBase_7_62: CSLA_MachinegunBase_5_56 {}; - -class CSLA_UK59L: CSLA_MachinegunBase_7_62 { - magazineWell[] += {"CBA_762x54R_Vz59_LINKS"}; -}; - -class CSLA_PistolBase: Pistol_Base_F {}; - -class CSLA_Pi52: CSLA_PistolBase { - magazineWell[] += {"CBA_762x25_TT"}; -}; - -class CSLA_Pi82: CSLA_Pi52 { - magazineWell[] += {"CBA_9x18_CZ82"}; -}; - -class CSLA_Sa61: CSLA_Pi52 { - magazineWell[] += {"CBA_32ACP_Vz61"}; -}; - -class CSLA_LauncherBase: Launcher_Base_F {}; - -class CSLA_RPG7: CSLA_LauncherBase { - magazineWell[] += {"CBA_RPG7"}; -}; - -class US85_weaponBase: Rifle_Base_F {}; - -class US85_FAL_BASE: US85_weaponBase { - magazineWell[] += {"CBA_762x51_FAL", "CBA_762x51_FAL_L"}; -}; - -class US85_M16_base: US85_weaponBase { - magazineWell[] += {"CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"}; -}; - -class US85_M21_Base: US85_weaponBase { - magazineWell[] += {"CBA_762x51_M14", "CBA_762x51_M14_L"}; -}; - -class US85_MPV_BASE: US85_weaponBase { - magazineWell[] += {"CBA_9x19_MP5"}; -}; - -class US85_MachinegunBase_5_56: US85_weaponBase {}; - -class US85_M249: US85_MachinegunBase_5_56 { - magazineWell[] += {"CBA_556x45_MINIMI"}; -}; - -class US85_MachinegunBase_7_62: US85_MachinegunBase_5_56 {}; - -class US85_M60: US85_MachinegunBase_7_62 { - magazineWell[] += {"CBA_762x51_LINKS"}; -}; - -class US85_pistolBase: Pistol_Base_F {}; - -class US85_1911 { - magazineWell[] += {"CBA_45ACP_1911"}; -}; - -class US85_M9: US85_pistolBase { - magazineWell[] += {"CBA_9x19_M9"}; -}; - -class US85_launcherBase: Launcher_Base_F {}; - -class US85_MAAWS: US85_launcherBase { - magazineWell[] += {"CBA_Carl_Gustaf"}; -}; diff --git a/addons/jam/jam_csla/CfgWeapons.hpp b/addons/jam/jam_csla/CfgWeapons.hpp new file mode 100644 index 0000000000..842582d051 --- /dev/null +++ b/addons/jam/jam_csla/CfgWeapons.hpp @@ -0,0 +1,91 @@ +class CfgWeapons { + + class CSLA_baseWeapon; + + class CSLA_OP63_Base: CSLA_baseWeapon { + magazineWell[] += {"CBA_762x54R_SVD"}; + }; + + class CSLA_rSa61: CSLA_baseWeapon { + magazineWell[] += {"CBA_32ACP_Vz61"}; + }; + + class CSLA_Sa58_Base: CSLA_baseWeapon { + magazineWell[] += {"CBA_762x39_AK"}; + }; + + class CSLA_MachinegunBase_5_56: CSLA_baseWeapon {}; + + class CSLA_MachinegunBase_7_62: CSLA_MachinegunBase_5_56 {}; + + class CSLA_UK59L: CSLA_MachinegunBase_7_62 { + magazineWell[] += {"CBA_762x54R_Vz59_LINKS"}; + }; + + class CSLA_PistolBase; + + class CSLA_Pi52: CSLA_PistolBase { + magazineWell[] += {"CBA_762x25_TT"}; + }; + + class CSLA_Pi82: CSLA_Pi52 { + magazineWell[] += {"CBA_9x18_CZ82"}; + }; + + class CSLA_Sa61: CSLA_Pi52 { + magazineWell[] += {"CBA_32ACP_Vz61"}; + }; + + class CSLA_LauncherBase; + + class CSLA_RPG7: CSLA_LauncherBase { + magazineWell[] += {"CBA_RPG7"}; + }; + + class US85_weaponBase; + + class US85_FAL_BASE: US85_weaponBase { + magazineWell[] += {"CBA_762x51_FAL", "CBA_762x51_FAL_L"}; + }; + + class US85_M16_base: US85_weaponBase { + magazineWell[] += {"CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"}; + }; + + class US85_M21_Base: US85_weaponBase { + magazineWell[] += {"CBA_762x51_M14", "CBA_762x51_M14_L"}; + }; + + class US85_MPV_BASE: US85_weaponBase { + magazineWell[] += {"CBA_9x19_MP5"}; + }; + + class US85_MachinegunBase_5_56: US85_weaponBase {}; + + class US85_M249: US85_MachinegunBase_5_56 { + magazineWell[] += {"CBA_556x45_MINIMI"}; + }; + + class US85_MachinegunBase_7_62: US85_MachinegunBase_5_56 {}; + + class US85_M60: US85_MachinegunBase_7_62 { + magazineWell[] += {"CBA_762x51_LINKS"}; + }; + + class US85_pistolBase; + + class US85_1911: US85_pistolBase { + magazineWell[] += {"CBA_45ACP_1911"}; + }; + + class US85_M9: US85_pistolBase { + magazineWell[] += {"CBA_9x19_M9"}; + }; + + class US85_launcherBase; + + class US85_MAAWS: US85_launcherBase { + magazineWell[] += {"CBA_Carl_Gustaf"}; + }; + +}; diff --git a/addons/jam/jam_csla/config.cpp b/addons/jam/jam_csla/config.cpp index 715ebac432..e8d91dfc42 100644 --- a/addons/jam/jam_csla/config.cpp +++ b/addons/jam/jam_csla/config.cpp @@ -16,4 +16,6 @@ class CfgPatches { skipWhenMissingDependencies = 1; VERSION_CONFIG; }; -}; \ No newline at end of file +}; + +#include "CfgWeapons.hpp" From c29abbce3a3a7a6a0e9c65024e31f103c003e07c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 7 Sep 2023 20:40:02 +0200 Subject: [PATCH 6/9] Migrate CfgMagazineWells to jam_csla --- addons/jam/CfgMagazineWells.hpp | 15 +-- addons/jam/jam_csla/CfgMagazineWells.hpp | 133 +++++++++++++++++++++++ addons/jam/jam_csla/config.cpp | 1 + addons/jam/magwells_12gauge.hpp | 12 +- addons/jam/magwells_32ACP.hpp | 7 +- addons/jam/magwells_40mm.hpp | 3 - addons/jam/magwells_45ACP.hpp | 3 - addons/jam/magwells_556x45.hpp | 6 - addons/jam/magwells_762x25.hpp | 7 +- addons/jam/magwells_762x39.hpp | 5 - addons/jam/magwells_762x51.hpp | 11 +- addons/jam/magwells_762x54.hpp | 15 +-- addons/jam/magwells_9x18.hpp | 7 +- addons/jam/magwells_9x19.hpp | 9 +- 14 files changed, 143 insertions(+), 91 deletions(-) create mode 100644 addons/jam/jam_csla/CfgMagazineWells.hpp diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index c0b80778e7..b6ebc00e81 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -78,12 +78,7 @@ class CfgMagazineWells { class CBA_Bazooka {}; // M1, M1A1 Bazooka class CBA_Panzerschreck {}; // Panzerschreck RPzB 54 class CBA_PIAT {}; // PIAT - class CBA_SMAW { // Mk 153 Shoulder-Launched Multipurpose Assault Weapon - CSLA_rounds[] = { - "US85_SMAW_HEAA", - "US85_SMAW_HEDP" - }; - }; + class CBA_SMAW {}; // Mk 153 Shoulder-Launched Multipurpose Assault Weapon class CBA_SMAW_Spotting_Rifle {}; // Mk 153 Shoulder-Launched Multipurpose Assault Weapon - Spotting Rifle class CBA_Carl_Gustaf { // MAAWS, RAWS @@ -91,19 +86,11 @@ class CfgMagazineWells { "MRAWS_HEAT_F", "MRAWS_HE_F" }; - CSLA_rounds[] = { - "US85_MAAWS_HEAT", - "US85_MAAWS_HEDP" - }; }; class CBA_RPG7 { BI_rockets[] = { "RPG7_F" }; - CSLA_rockets[] = { - "CSLA_PG7M110", - "CSLA_PG7M110V" - }; }; }; diff --git a/addons/jam/jam_csla/CfgMagazineWells.hpp b/addons/jam/jam_csla/CfgMagazineWells.hpp new file mode 100644 index 0000000000..13d999cd37 --- /dev/null +++ b/addons/jam/jam_csla/CfgMagazineWells.hpp @@ -0,0 +1,133 @@ +class CfgMagazineWells { + + class CBA_12g_8rnds { + CSLA_rounds[] = { + "US85_8Rnd_12GaugeSlug" + }; + }; + + class CBA_12g_1rnd { + CSLA_rounds[] = { + "US85_12GaugeSlug" + }; + }; + + class CBA_32ACP_Vz61 { + CSLA_mags[] = { + "CSLA_Sa61_20rnd_7_65Pi27", + "CSLA_Sa61_20rnd_7_65PiCv27" + }; + }; + + class CBA_40mm_M203 { + CSLA_grenades[] = { + "US85_1Rnd_HE" + }; + }; + + class CBA_45ACP_1911 { + CSLA_mags[] = { + "US85_1911_7Rnd_045ACP" + }; + }; + + class CBA_556x45_MINIMI { + CSLA_boxes[] = { + "US85_200Rnd_556x45" + }; + }; + + class CBA_556x45_STANAG { + CSLA_mags[] = { + "US85_30Rnd_556x45" + }; + }; + + class CBA_762x25_TT { + CSLA_mags[] = { + "CSLA_Pi52_8rnd_7_62Pi52", + "CSLA_Pi52_8rnd_7_62PiCv52" + }; + }; + + class CBA_762x39_AK { + CSLA_mags[] = { + "CSLA_Sa58_30rnd_7_62Cv43", + "CSLA_Sa58_30rnd_7_62Sv43", + "CSLA_Sa58_30rnd_7_62vz43" + }; + }; + + class CBA_762x51_AICS { + CSLA_mags[] = { + "US85_10Rnd_762x51" + }; + }; + + class CBA_762x51_LINKS { + CSLA_belts[] = { + "US85_50Rnd_762x51", + "US85_100Rnd_762x51", + "US85_200Rnd_762x51" + }; + }; + + class CBA_762x54R_SVD { + CSLA_mags[] = { + "CSLA_OP63_10rnd_7_62Odst59", + "CSLA_OP63_10rnd_7_62Cv59" + }; + }; + + class CBA_762x54R_Vz59_LINKS { + CSLA_belts[] = { + "CSLA_UK59_50rnd_7_62Cv59", + "CSLA_UK59_50rnd_7_62PZ59", + "CSLA_UK59_50rnd_7_62Sv59", + "CSLA_UK59_50rnd_7_62Tz59", + "CSLA_UK59_50rnd_7_62TzSv59", + "CSLA_UK59_50rnd_7_62vz59" + }; + }; + + class CBA_9x18_CZ82 { + CSLA_mags[] = { + "CSLA_Pi82_12rnd_9Pi82", + "CSLA_Pi82_12rnd_9PiCv82" + }; + }; + + class CBA_9x19_M9 { + CSLA_mags[] = { + "US85_M9_15Rnd_9Luger" + }; + }; + + class CBA_9x19_MP5 { + CSLA_mags[] = { + "US85_MPV_30Rnd_9Luger" + }; + }; + + class CBA_SMAW { + CSLA_rounds[] = { + "US85_SMAW_HEAA", + "US85_SMAW_HEDP" + }; + }; + + class CBA_Carl_Gustaf { + CSLA_rounds[] = { + "US85_MAAWS_HEAT", + "US85_MAAWS_HEDP" + }; + }; + + class CBA_RPG7 { + CSLA_rockets[] = { + "CSLA_PG7M110", + "CSLA_PG7M110V" + }; + }; + +}; diff --git a/addons/jam/jam_csla/config.cpp b/addons/jam/jam_csla/config.cpp index e8d91dfc42..c6775186aa 100644 --- a/addons/jam/jam_csla/config.cpp +++ b/addons/jam/jam_csla/config.cpp @@ -18,4 +18,5 @@ class CfgPatches { }; }; +#include "CfgMagazineWells.hpp" #include "CfgWeapons.hpp" diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp index b2534fc6ac..eb4cb837c0 100644 --- a/addons/jam/magwells_12gauge.hpp +++ b/addons/jam/magwells_12gauge.hpp @@ -1,20 +1,12 @@ class CBA_12g_9rnds {}; // 9 loose rounds - class CBA_12g_8rnds { // 8 loose rounds - CSLA_rounds[] = { - "US85_8Rnd_12GaugeSlug" - }; - }; + class CBA_12g_8rnds {}; // 8 loose rounds class CBA_12g_7rnds {}; // 7 loose rounds class CBA_12g_6rnds {}; // 6 loose rounds class CBA_12g_5rnds {}; // 5 loose rounds class CBA_12g_4rnds {}; // 4 loose rounds class CBA_12g_3rnds {}; // 3 loose rounds class CBA_12g_2rnds {}; // 2 loose rounds - class CBA_12g_1rnd { // 1 loose round - CSLA_rounds[] = { - "US85_12GaugeSlug" - }; - }; + class CBA_12g_1rnd {}; // 1 loose round class CBA_12g_AA12 {}; // AA-12 Stick Magazines class CBA_12g_AA12_XL {}; // AA-12 Drum Magazines diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp index ef5e1e23d1..468a1451b0 100644 --- a/addons/jam/magwells_32ACP.hpp +++ b/addons/jam/magwells_32ACP.hpp @@ -5,10 +5,5 @@ class CBA_32ACP_PP {}; // Walther PP in .32 ACP (7.65x17mm Browning) class CBA_32ACP_PPK {}; // Walther PPK in .32 ACP (7.65x17mm Browning) class CBA_32ACP_Vz27 {}; // vz. 27 - class CBA_32ACP_Vz61 { // Škorpion (vz. 61), M84 - CSLA_mags[] = { - "CSLA_Sa61_20rnd_7_65Pi27", - "CSLA_Sa61_20rnd_7_65PiCv27" - }; - }; + class CBA_32ACP_Vz61 {}; // Škorpion (vz. 61), M84 class CBA_32ACP_Welrod {}; // Welrod MkII in .32 ACP (7.65x17mm Browning) diff --git a/addons/jam/magwells_40mm.hpp b/addons/jam/magwells_40mm.hpp index 7868381ec7..1c2f043699 100644 --- a/addons/jam/magwells_40mm.hpp +++ b/addons/jam/magwells_40mm.hpp @@ -36,8 +36,5 @@ "UGL_FlareYellow_F", "UGL_FlareCIR_F" }; - CSLA_grenades[] = { - "US85_1Rnd_HE" - }; }; class CBA_40mm_M203_6rnds {}; // 6 loose M203 type grenades for M32 MGL diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp index bf99240aa2..64a85bdad7 100644 --- a/addons/jam/magwells_45ACP.hpp +++ b/addons/jam/magwells_45ACP.hpp @@ -2,9 +2,6 @@ BI_mags[] = { "9Rnd_45ACP_Mag" }; - CSLA_mags[] = { - "US85_1911_7Rnd_045ACP" - }; }; class CBA_45ACP_C96 {}; // Mauser C-96 in .45 ACP class CBA_9x19_CZ97 {}; // CZ 97 in .45 ACP diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp index 67e3f1de67..06301bd027 100644 --- a/addons/jam/magwells_556x45.hpp +++ b/addons/jam/magwells_556x45.hpp @@ -13,9 +13,6 @@ "200Rnd_556x45_Box_Tracer_F", "200Rnd_556x45_Box_Tracer_Red_F" }; - CSLA_boxes[] = { - "US85_200Rnd_556x45" - }; }; class CBA_556x45_TYPE97 {}; // QBZ-97 Stick Mags @@ -53,9 +50,6 @@ "30Rnd_556x45_Stanag_Sand_Tracer_Green", "30Rnd_556x45_Stanag_Sand_Tracer_Yellow" }; - CSLA_mags[] = { - "US85_30Rnd_556x45" - }; }; class CBA_556x45_STANAG_L {}; // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60) diff --git a/addons/jam/magwells_762x25.hpp b/addons/jam/magwells_762x25.hpp index c73414b9c6..0e2e2dfaa4 100644 --- a/addons/jam/magwells_762x25.hpp +++ b/addons/jam/magwells_762x25.hpp @@ -7,9 +7,4 @@ class CBA_762x25_PPS {}; // PPS-43 class CBA_762x25_PPSh_Drum {}; // PPSh-41 drum magazines class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines - class CBA_762x25_TT { // TT-30, TT-33 Tokarev - CSLA_mags[] = { - "CSLA_Pi52_8rnd_7_62Pi52", - "CSLA_Pi52_8rnd_7_62PiCv52" - }; - }; + class CBA_762x25_TT {}; // TT-30, TT-33 Tokarev diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp index c25ea7b523..7cec850954 100644 --- a/addons/jam/magwells_762x39.hpp +++ b/addons/jam/magwells_762x39.hpp @@ -5,11 +5,6 @@ "30Rnd_762x39_Mag_Tracer_F", "30Rnd_762x39_Mag_Tracer_Green_F" }; - CSLA_mags[] = { - "CSLA_Sa58_30rnd_7_62Cv43", - "CSLA_Sa58_30rnd_7_62Sv43", - "CSLA_Sa58_30rnd_7_62vz43" - }; }; class CBA_762x39_CZ807 {}; // 762x39mm CZ 807 magazines diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp index 38f627a9c4..9e079e2bc8 100644 --- a/addons/jam/magwells_762x51.hpp +++ b/addons/jam/magwells_762x51.hpp @@ -4,11 +4,7 @@ class CBA_762x51_4rnds {}; // 4 loose rounds of 7.62x51mm NATO class CBA_762x51_5rnds {}; // 5 loose rounds of 7.62x51mm NATO - class CBA_762x51_AICS { // AICS short action mag (5/10 rounds) - CSLA_mags[] = { - "US85_10Rnd_762x51" - }; - }; + class CBA_762x51_AICS {}; // AICS short action mag (5/10 rounds) class CBA_762x51_AR10 {}; // AR-10 standard mag (20 rounds) class CBA_762x51_AR10_L {}; // AR-10 long mag (25/30 rounds) @@ -35,11 +31,6 @@ "150Rnd_762x51_Box", "150Rnd_762x51_Box_Tracer" }; - CSLA_belts[] = { - "US85_50Rnd_762x51", - "US85_100Rnd_762x51", - "US85_200Rnd_762x51" - }; }; class CBA_762x51_M14 {}; // M14 diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp index 2767d87cfe..8dd9752e67 100644 --- a/addons/jam/magwells_762x54.hpp +++ b/addons/jam/magwells_762x54.hpp @@ -17,21 +17,8 @@ BI_mags[] = { "10Rnd_762x54_Mag" }; - CSLA_mags[] = { - "CSLA_OP63_10rnd_7_62Odst59", - "CSLA_OP63_10rnd_7_62Cv59" - }; }; class CBA_762x54R_SVT {}; // SVT-38, SVT-40 - class CBA_762x54R_Vz59_LINKS { //Uk vz. 59, UK59, vz 59 - CSLA_belts[] = { - "CSLA_UK59_50rnd_7_62Cv59", - "CSLA_UK59_50rnd_7_62PZ59", - "CSLA_UK59_50rnd_7_62Sv59", - "CSLA_UK59_50rnd_7_62Tz59", - "CSLA_UK59_50rnd_7_62TzSv59", - "CSLA_UK59_50rnd_7_62vz59" - }; - }; + class CBA_762x54R_Vz59_LINKS {}; //Uk vz. 59, UK59, vz 59 diff --git a/addons/jam/magwells_9x18.hpp b/addons/jam/magwells_9x18.hpp index 57eb933d61..7331db9c1a 100644 --- a/addons/jam/magwells_9x18.hpp +++ b/addons/jam/magwells_9x18.hpp @@ -1,10 +1,5 @@ class CBA_9x18_APS {}; // Stechkin automatic pistol (APS) - class CBA_9x18_CZ82 { // CZ 82, CZ 83 - CSLA_mags[] = { - "CSLA_Pi82_12rnd_9Pi82", - "CSLA_Pi82_12rnd_9PiCv82" - }; - }; + class CBA_9x18_CZ82 {}; // CZ 82, CZ 83 class CBA_9x18_Fort12 {}; // Fort-12 class CBA_9x18_GPP9M {}; // Grand Power K100 P9M class CBA_9x18_Ots01 {}; // OTs-01 Kobalt diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp index 6616219643..6299e77d68 100644 --- a/addons/jam/magwells_9x19.hpp +++ b/addons/jam/magwells_9x19.hpp @@ -13,11 +13,7 @@ class CBA_9x19_Glock_Cpct {}; // Compact Glock in 9x19mm (Glock 19, 46) class CBA_9x19_Glock_Full {}; // Fullsize Glock in 9x19mm (Glock 17, 18, 34, 45) class CBA_9x19_HiPower {}; // Browning HiPower - class CBA_9x19_M9 { // Beretta M9 - CSLA_mags[] = { - "US85_M9_15Rnd_9Luger" - }; - }; + class CBA_9x19_M9 {}; // Beretta M9 class CBA_9x19_MAB38 {}; // Beretta Model 38 class CBA_9x19_MP28 {}; // MP18 Straight Magazines, MP28, MP35 class CBA_9x19_MP40 {}; // MP40, MP38 @@ -29,9 +25,6 @@ "30Rnd_9x21_Mag_SMG_02_Tracer_Yellow", "30Rnd_9x21_Mag_SMG_02_Tracer_Green" }; - CSLA_mags[] = { - "US85_MPV_30Rnd_9Luger" - }; }; class CBA_9x19_Ots27 {}; // OTs-27 Berdysh class CBA_9x19_P08 {}; // Luger P08, MP18 From 4017e624328482f3977230ca15896b9c6faf7e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 7 Sep 2023 20:45:48 +0200 Subject: [PATCH 7/9] Remove include from jam CfgWeapons --- addons/jam/CfgWeapons.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp index d0f9c71fa5..90d4dc88e7 100644 --- a/addons/jam/CfgWeapons.hpp +++ b/addons/jam/CfgWeapons.hpp @@ -128,6 +128,4 @@ class CfgWeapons { class hgun_ACPC2_F: Pistol_Base_F { magazineWell[] += {"CBA_45ACP_1911"}; }; - - #include "CfgWeapons_CSLA.hpp" }; From c012b31c3a51031cf6c2d9b8d6950c047cf5e385 Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 7 Sep 2023 23:46:25 +0200 Subject: [PATCH 8/9] Update addons/jam/jam_csla/config.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Dahlgren --- addons/jam/jam_csla/config.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/jam/jam_csla/config.cpp b/addons/jam/jam_csla/config.cpp index c6775186aa..e740928e71 100644 --- a/addons/jam/jam_csla/config.cpp +++ b/addons/jam/jam_csla/config.cpp @@ -8,7 +8,8 @@ class CfgPatches { requiredVersion = REQUIRED_VERSION; requiredAddons[] = { "cba_jam", - "CSLA" + "CSLA", + "US85" }; author = "$STR_CBA_Author"; authors[] = {}; From d9f4e732b6eb287a9659fac1ef43d2d6e04a47ba Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 12 Sep 2023 20:56:57 -0500 Subject: [PATCH 9/9] SUBADDON --- addons/jam/jam_csla/config.cpp | 4 ++-- addons/jam/jam_csla/script_component.hpp | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/jam/jam_csla/config.cpp b/addons/jam/jam_csla/config.cpp index e740928e71..2c1aa45ae5 100644 --- a/addons/jam/jam_csla/config.cpp +++ b/addons/jam/jam_csla/config.cpp @@ -1,8 +1,8 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - name = ECSTRING(jam,component); + class SUBADDON { + name = CSTRING(component); units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; diff --git a/addons/jam/jam_csla/script_component.hpp b/addons/jam/jam_csla/script_component.hpp index 4b873e601a..4dae27a452 100644 --- a/addons/jam/jam_csla/script_component.hpp +++ b/addons/jam/jam_csla/script_component.hpp @@ -1,3 +1,2 @@ -#define COMPONENT jam_csla -#include "\x\cba\addons\main\script_mod.hpp" -#include "\x\cba\addons\main\script_macros.hpp" +#define SUBCOMPONENT csla +#include "..\script_component.hpp"