diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index 35f2c7e899..d7d148e65c 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -1,6 +1,9 @@ #define BASE_DRAG -0.01 #define HD_MULT 5 #define BASE_DRAG_HD (BASE_DRAG * HD_MULT) +#define ACE_FRAG_RM_EH class EventHandlers {\ + delete ADDON;\ +} class CfgAmmo { class B_65x39_Caseless; @@ -16,6 +19,7 @@ class CfgAmmo { typicalSpeed = 800; maxSpeed = 1500; deflecting = 65; + ACE_FRAG_RM_EH; }; class GVAR(tiny): GVAR(base) { diff --git a/addons/frag/cfgAmmoFragSpawner.hpp b/addons/frag/cfgAmmoFragSpawner.hpp index 265372066f..be85d81be1 100644 --- a/addons/frag/cfgAmmoFragSpawner.hpp +++ b/addons/frag/cfgAmmoFragSpawner.hpp @@ -13,6 +13,7 @@ class GVAR(spawnbase) : B_65x39_Caseless { submunitionParentSpeedCoef = 1; triggerSpeedCoef[] = {0.75, 1.5}; triggerTime = 0; + ACE_FRAG_RM_EH; }; /********************* ***************************/ diff --git a/addons/frag/cfgAmmoSpall.hpp b/addons/frag/cfgAmmoSpall.hpp index 9eb2e7a322..b3bcb4f9d8 100644 --- a/addons/frag/cfgAmmoSpall.hpp +++ b/addons/frag/cfgAmmoSpall.hpp @@ -1,7 +1,7 @@ class GVAR(spallBase) : B_65x39_Caseless { access = 3; - submunitionAmmo[] = {"ace_frag_small_c",4,"ace_frag_medium_c",3,"ace_frag_large_c",2,"ace_frag_huge_c",1}; + submunitionAmmo[] = {QGVAR(small),4,QGVAR(medium),3,QGVAR(large),2,QGVAR(huge),1}; submunitionConeType[] = {"random", 20}; submunitionConeAngle = 40; submunitionDirectionType = "SubmunitionModelDirection"; @@ -11,39 +11,40 @@ class GVAR(spallBase) : B_65x39_Caseless triggerSpeedCoef[] = {0.75,1.25}; deleteParentWhenTriggered = 1; submunitionParentSpeedCoef = 1; + ACE_FRAG_RM_EH; }; class GVAR(spall_tiny) : GVAR(spallBase) { - submunitionAmmo[] = {"ace_frag_small_c", 4, "ace_frag_medium_c", 1}; + submunitionAmmo[] = {QGVAR(small), 4, QGVAR(medium), 1}; submunitionConeType[] = {"poissondisccenter", 5}; submunitionConeAngle = 40; }; class GVAR(spall_small) : GVAR(spallBase) { - submunitionAmmo[] = {"ace_frag_small_c", 4,"ace_frag_medium_c", 1}; + submunitionAmmo[] = {QGVAR(small), 4,QGVAR(medium), 1}; submunitionConeType[] = {"poissondisccenter", 10}; submunitionConeAngle = 40; }; class GVAR(spall_medium) : GVAR(spallBase) { - submunitionAmmo[] = {"ace_frag_small_c", 2, "ace_frag_small_HD_c", 1,"ace_frag_medium_c", 3, "ace_frag_medium_HD_c", 1, "ace_frag_large_c", 2}; + submunitionAmmo[] = {QGVAR(small), 2, QGVAR(small_HD), 1,QGVAR(medium), 3, QGVAR(medium_HD), 1, QGVAR(large), 2}; submunitionConeType[] = {"poissondisccenter", 15}; submunitionConeAngle = 40; }; class GVAR(spall_large) : GVAR(spallBase) { - submunitionAmmo[] = {"ace_frag_tiny_c", 3, "ace_frag_tiny_HD_c", 3, "ace_frag_small_c", 4, "ace_frag_small_HD_c", 4, "ace_frag_medium_HD_c", 5, "ace_frag_large_c", 2, "ace_frag_large_HD_c", 2, "ace_frag_huge_c",1}; + submunitionAmmo[] = {QGVAR(tiny), 3, QGVAR(tiny_HD), 3, QGVAR(small), 4, QGVAR(small_HD), 4, QGVAR(medium_HD), 5, QGVAR(large), 2, QGVAR(large_HD), 2, QGVAR(huge),1}; submunitionConeType[] = {"poissondisccenter", 15}; submunitionConeAngle = 40; }; class GVAR(spall_huge) : GVAR(spallBase) { - submunitionAmmo[] = {"ace_frag_tiny_c", 3, "ace_frag_tiny_HD_c", 3, "ace_frag_small_c", 4, "ace_frag_small_HD_c", 4, "ace_frag_medium_HD_c", 5, "ace_frag_large_c", 2, "ace_frag_large_HD_c", 2, "ace_frag_huge_c",1}; + submunitionAmmo[] = {QGVAR(tiny), 3, QGVAR(tiny_HD), 3, QGVAR(small), 4, QGVAR(small_HD), 4, QGVAR(medium_HD), 5, QGVAR(large), 2, QGVAR(large_HD), 2, QGVAR(huge),1}; submunitionConeType[] = {"poissondisccenter", 20}; submunitionConeAngle = 40; }; \ No newline at end of file