From 92941c11dedb04bec5adce32b22bf1174d76e00d Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 13 Jun 2020 16:03:28 -0500 Subject: [PATCH] Aircraft - Restore missing laser designator on Commanche (#7752) * Aircraft - Restore missing laser designator on Commanche This now matches vanilla Close #7712 * Update addons/aircraft/Heli_Attack_01_base_F.hpp Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> * Update addons/aircraft/Heli_Attack_01_base_F.hpp Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> --- addons/aircraft/Heli_Attack_01_base_F.hpp | 9 ++++----- addons/hellfire/CfgVehicles.hpp | 6 ------ addons/hellfire/config.cpp | 1 - 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 addons/hellfire/CfgVehicles.hpp diff --git a/addons/aircraft/Heli_Attack_01_base_F.hpp b/addons/aircraft/Heli_Attack_01_base_F.hpp index 7e59abad48..37d1871c6d 100644 --- a/addons/aircraft/Heli_Attack_01_base_F.hpp +++ b/addons/aircraft/Heli_Attack_01_base_F.hpp @@ -3,8 +3,8 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { class Turrets: Turrets { class MainTurret: MainTurret { - weapons[] = {"ACE_gatling_20mm_Comanche", "missiles_DAGR", "missiles_ASRAAM"}; - magazines[] = {"ACE_500Rnd_20mm_shells_Comanche", "4Rnd_AAA_missiles", "24Rnd_PG_missiles"}; + weapons[] = {"ACE_gatling_20mm_Comanche", "missiles_DAGR", "missiles_ASRAAM", "Laserdesignator_mounted"}; + magazines[] = {"ACE_500Rnd_20mm_shells_Comanche", "4Rnd_AAA_missiles", "24Rnd_PG_missiles", "Laserbatteries"}; turretInfoType = "Rsc_ACE_Helo_UI_Turret"; @@ -119,9 +119,8 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { class Heli_Attack_01_dynamicLoadout_base_F: Heli_Attack_01_base_F { class Turrets: Turrets { class MainTurret: MainTurret { - weapons[] = {"ACE_gatling_20mm_Comanche"}; - magazines[] = {"ACE_500Rnd_20mm_shells_Comanche"}; + weapons[] = {"ACE_gatling_20mm_Comanche", "Laserdesignator_mounted"}; + magazines[] = {"ACE_500Rnd_20mm_shells_Comanche", "Laserbatteries"}; }; }; }; - diff --git a/addons/hellfire/CfgVehicles.hpp b/addons/hellfire/CfgVehicles.hpp deleted file mode 100644 index 89dbf131d7..0000000000 --- a/addons/hellfire/CfgVehicles.hpp +++ /dev/null @@ -1,6 +0,0 @@ -class CfgVehicles { - class Heli_Attack_01_base_F; - class Heli_Attack_01_dynamicLoadout_base_F: Heli_Attack_01_base_F { - GVAR(addLaserDesignator) = 1; - }; -}; diff --git a/addons/hellfire/config.cpp b/addons/hellfire/config.cpp index 911e016d7f..37358ea702 100644 --- a/addons/hellfire/config.cpp +++ b/addons/hellfire/config.cpp @@ -19,5 +19,4 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgMagazines.hpp" #include "CfgMagazineWells.hpp" -#include "CfgVehicles.hpp" #include "CfgWeapons.hpp"