From 07dfe52133b2ae7e7fe78555913db065699401e9 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 3 Apr 2015 19:07:13 -0500 Subject: [PATCH] Remove Duplicate Mortar Code (inherit from statics) Before an action added to staticWeapon wouldn't be applied to mk6 mortar --- addons/captives/CfgVehicles.hpp | 5 ----- addons/dragging/CfgEventHandlers.hpp | 5 ----- addons/interaction/CfgVehicles.hpp | 20 -------------------- addons/medical/CfgVehicles.hpp | 14 -------------- 4 files changed, 44 deletions(-) diff --git a/addons/captives/CfgVehicles.hpp b/addons/captives/CfgVehicles.hpp index 89ab74d5bb..10b2d0285f 100644 --- a/addons/captives/CfgVehicles.hpp +++ b/addons/captives/CfgVehicles.hpp @@ -149,11 +149,6 @@ class CfgVehicles { MACRO_LOADUNLOADCAPTIVE }; - class StaticMortar; - class Mortar_01_base_F: StaticMortar { - MACRO_LOADUNLOADCAPTIVE - }; - class Box_NATO_Support_F; class ACE_Box_Misc: Box_NATO_Support_F { class TransportItems { diff --git a/addons/dragging/CfgEventHandlers.hpp b/addons/dragging/CfgEventHandlers.hpp index f568eace4e..e5c454e969 100644 --- a/addons/dragging/CfgEventHandlers.hpp +++ b/addons/dragging/CfgEventHandlers.hpp @@ -23,11 +23,6 @@ class Extended_Init_EventHandlers { init = QUOTE(_this call DFUNC(initObject)); }; }; - class StaticMortar { - class ADDON { - init = QUOTE(_this call DFUNC(initObject)); - }; - }; class ReammoBox_F { class ADDON { init = QUOTE(_this call DFUNC(initObject)); diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index 02dd078a2b..e85300f301 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -525,26 +525,6 @@ class CfgVehicles { }; }; - class StaticMortar; - class Mortar_01_base_F: StaticMortar { - class ACE_Actions { - class ACE_MainActions { - displayName = "$STR_ACE_Interaction_MainAction"; - selection = "gunnerview"; - distance = 2; - condition = "true"; - }; - }; - class ACE_SelfActions { - class ACE_Passengers { - displayName = "$STR_ACE_Interaction_Passengers"; - condition = "true"; - statement = ""; - insertChildren = QUOTE(_this call FUNC(addPassengersActions)); - }; - }; - }; - class thingX; class ReammoBox_F: thingX { class ACE_Actions { diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index da88e0f324..f28e1c8886 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -2072,18 +2072,4 @@ class CfgVehicles { }; }; }; - - class StaticMortar; - class Mortar_01_base_F: StaticMortar { - class ACE_Actions { - class ACE_MainActions { - class ACE_UnloadPatients { - displayName = "$STR_ACE_Medical_UnloadPatient"; - condition = "true"; - statement = ""; - insertChildren = QUOTE(_this call FUNC(addUnloadPatientActions)); - }; - }; - }; - }; };