diff --git a/optionals/compat_rhs_usf3/CfgMagazineWells.hpp b/optionals/compat_rhs_usf3/CfgMagazineWells.hpp new file mode 100644 index 0000000000..6be0ec603f --- /dev/null +++ b/optionals/compat_rhs_usf3/CfgMagazineWells.hpp @@ -0,0 +1,5 @@ +class CfgMagazineWells { + class UGL_40x36 { // rhsusf\addons\rhsusf_c_weapons\cfgMagazineWells.hpp + ADDON[] = {"ACE_HuntIR_M203"}; + }; +}; diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 84299450b2..190cbadd35 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -16,11 +16,6 @@ class CfgWeapons { class Rifle_Base_F; class srifle_EBR_F; class launch_O_Titan_F; - class UGL_F; - - class rhs_weap_M320_Base_F: Pistol_Base_F { // Standalone M320 (pistol slot) - magazines[] += {"ACE_HuntIR_M203"}; - }; class GM6_base_F; class rhs_weap_M107_Base_F: GM6_base_F { ACE_barrelTwist = 381.0; @@ -48,10 +43,6 @@ class CfgWeapons { ACE_RailHeightAboveBore = 2.56518; ACE_barrelTwist = 177.8; ACE_barrelLength = 368.3; - class M203_GL: UGL_F { - magazines[] += {"ACE_HuntIR_M203"}; - }; - // Added to the M320_GL in subConfig }; class rhs_weap_m4a1; class rhs_weap_hk416d10: rhs_weap_m4a1 { diff --git a/optionals/compat_rhs_usf3/config.cpp b/optionals/compat_rhs_usf3/config.cpp index 5847a2ac40..59aaa625bd 100644 --- a/optionals/compat_rhs_usf3/config.cpp +++ b/optionals/compat_rhs_usf3/config.cpp @@ -17,6 +17,7 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "CfgEventHandlers.hpp" #include "CfgMagazines.hpp" +#include "CfgMagazineWells.hpp" #include "CfgWeapons.hpp" #include "CfgVehicles.hpp" #include "CfgGlasses.hpp" diff --git a/optionals/compat_rhs_usf3/subConfig/config.cpp b/optionals/compat_rhs_usf3/subConfig/config.cpp deleted file mode 100644 index e3c3b30ae0..0000000000 --- a/optionals/compat_rhs_usf3/subConfig/config.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp" -#undef COMPONENT -#define COMPONENT compat_rhs_usf3_sub - -class CfgPatches { - class ADDON { - name = COMPONENT_NAME; - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_compat_rhs_usf3"}; - author = ECSTRING(common,ACETeam); - url = ECSTRING(main,URL); - VERSION_CONFIG; - }; -}; - -class CfgWeapons { - class arifle_MX_Base_F; - class rhs_weap_m4_Base: arifle_MX_Base_F { - class M203_GL; - class M320_GL: M203_GL { - magazines[] += {"ACE_HuntIR_M203"}; - }; - }; -};