Merge pull request #110 from 501st-Aux-Mod-Team/fix_arc_crash

fix EventHandlers still present after move to XEH

addons - Copy/RD501_Vehicles/_init_functions/republic_aircraft_turrets.hpp

@@ -4,7 +4,7 @@
             init = "[_this select 0] execVM '\arc\init.sqf';[_this select 0] execVM '\arc\initturbine.sqf';";
         }
         class drone_script {
-            init = [_this select 0,macro_single_quote(macro_new_vehicle(drone,Clone_Recon_Droid)),[0,-2.2,1.75]] spawn macro_fnc_name(apply_aircraft_drone);
+            init = [_this select 0,macro_single_quote(macro_new_vehicle(drone,Clone_Recon_Droid)),[0,-2.2,1.0]] spawn macro_fnc_name(apply_aircraft_drone);
         };
 		macro_standard_eh
     };

addons - Copy/RD501_Vehicles/air/ARC_170/config.cpp

@@ -54,6 +54,7 @@ class CfgVehicles
 		};
 		class Components;
 		class ACE_SelfActions;
+		class EventHandlers{};
 	};
 
 	class macro_new_vehicle(ARC_170,MKII):swop_arc_t

addons - Copy/RD501_Vehicles/air/A_Wing/config.cpp

@@ -92,7 +92,9 @@ class CfgVehicles
 		altNoForce = 9000;
 		airBrakeFrictionCoef = 80.4;
 		armor = 200;
-		
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn
@@ -167,7 +169,9 @@ class CfgVehicles
 		airBrakeFrictionCoef = 80.4;
 		altNoForce = 9000;
 		armor = 200;
-		
+
+		class EventHandlers{};
+
 		class ACE_SelfActions:ACE_SelfActions
 		{
 			#include "../../common/universal_hud_color_changer.hpp"

addons - Copy/RD501_Vehicles/air/Delta/common_delta.hpp

@@ -2,6 +2,7 @@
 		editorSubcategory = macro_editor_cat_air(Republic_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Republic)
 
+		class EventHandlers{};
 		class UserActions
 		{
 			class AfterburnerOff

addons - Copy/RD501_Vehicles/air/ETA/config.cpp

@@ -74,6 +74,9 @@ class CfgVehicles
 		vehicleClass = macro_editor_vehicle_type_air(Republic)
 
 		gearsUpFrictionCoef = 25;
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOff

addons - Copy/RD501_Vehicles/air/HMP/common.hpp

@@ -3,6 +3,8 @@ editorSubcategory = macro_editor_cat_air(CIS_heli)
 vehicleClass = macro_editor_vehicle_type_air(CIS)
 airBrakeFrictionCoef = 80.4;
 
+class EventHandlers{};
+
 class UserActions
 {
     class ThrusterEngage

addons - Copy/RD501_Vehicles/air/HMP/config.cpp

@@ -42,8 +42,6 @@ class CfgPatches
 
 class CfgVehicles
 {
-	
-
 	class swop_HMP_droidgunship;
 
 	class swop_HMP_droidgunship_transport;

addons - Copy/RD501_Vehicles/air/TIE_series/config.cpp

@@ -61,8 +61,6 @@ class CfgVehicles
 	macro_inherit_ace_selfactions(swop_tiedef,Plane_Base_F)
 	macro_inherit_ace_selfactions(swop_tieb,Plane_Base_F)
 	macro_inherit_ace_selfactions(swop_tiex1,Plane_Base_F)
-	
-	
 
 	class macro_new_vehicle(TIE,stryker_MkII) : swop_tie_stryker
 	{
@@ -76,6 +74,9 @@ class CfgVehicles
 		faction = macro_empire_faction
 		editorSubcategory = macro_editor_cat_air(Empire_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Empire)
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn
@@ -139,6 +140,9 @@ class CfgVehicles
 		faction = macro_empire_faction
 		editorSubcategory = macro_editor_cat_air(Empire_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Empire)
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn
@@ -197,6 +201,9 @@ class CfgVehicles
 		faction = macro_empire_faction
 		editorSubcategory = macro_editor_cat_air(Empire_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Empire)
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn
@@ -256,6 +263,9 @@ class CfgVehicles
 		faction = macro_empire_faction
 		editorSubcategory = macro_editor_cat_air(Empire_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Empire)
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn
@@ -315,10 +325,9 @@ class CfgVehicles
 		faction = macro_empire_faction
 		editorSubcategory = macro_editor_cat_air(Empire_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Empire)
-		class UserActions
-		{
-			
-		};
+
+		class EventHandlers{};
+		class UserActions{};
 
 		weapons[] = {
 			macro_basic_air_weapons,
@@ -366,6 +375,9 @@ class CfgVehicles
 		faction = macro_empire_faction
 		editorSubcategory = macro_editor_cat_air(Empire_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Empire)
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn
@@ -414,15 +426,19 @@ class CfgVehicles
 	};
 
 	class Xtiefo;
+
 	macro_inherit_ace_selfactions(swop_tie_silencer,Plane_Base_F)
 	macro_inherit_ace_selfactions(swop_tiefo,Xtiefo)
 	macro_inherit_ace_selfactions(swop_tiefosf,Xtiefo)
+
 	class macro_new_vehicle(TIE,fo) : swop_tiefo
 	{
 
 		forceInGarage=1;
 		displayName="TIE First Order Class Mk.II";
 
+		class EventHandlers{};
+
 		class ACE_SelfActions:ACE_SelfActions
 		{		
 			
@@ -482,6 +498,8 @@ class CfgVehicles
 		forceInGarage=1;
 		displayName="TIE Special Forces Class Mk.II";
 
+		class EventHandlers{};
+
 		class ACE_SelfActions:ACE_SelfActions
 		{		
 			
@@ -549,6 +567,8 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat_air(First_Order)
 		vehicleClass = macro_editor_vehicle_type_air(First_Order)
 
+		class EventHandlers{};
+
 		class ACE_SelfActions:ACE_SelfActions
 		{		
 			

addons - Copy/RD501_Vehicles/air/V_Wing/config.cpp

@@ -105,6 +105,7 @@ class CfgVehicles
 		rudderControlsSensitivityCoef=4.5;
 		gearsUpFrictionCoef=0;
 
+		class EventHandlers{};
 		class UserActions
 		{
 			class AfterburnerOn

addons - Copy/RD501_Vehicles/air/Vulture/config.cpp

@@ -59,6 +59,9 @@ class CfgVehicles
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn

addons - Copy/RD501_Vehicles/air/Weird_Shuttles/config.cpp

@@ -99,6 +99,9 @@ class CfgVehicles
 		armor = 600;
 		forceInGarage=1;
 		displayname = "Millenium Falcon Mk.I";
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn

addons - Copy/RD501_Vehicles/air/X_Wing/config.cpp

@@ -50,27 +50,20 @@ class CfgVehicles
 	class swop_xw:Plane_Base_F
 	{
 		class ACE_SelfActions;
+		class EventHandlers{};
 	};
 
 	class swop_xwt70:Plane_Base_F
 	{
 		scope=0;
-		class EventHandlers
-		{
-			fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
-			init = "[_this select 0] execVM '\XT\init.sqf';[_this select 0] execVM '\XT\initturbine.sqf';";
-			killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');";
-			 class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-		};
+		class EventHandlers{};
 		class ACE_SelfActions;
 	};
 
 	class swop_xwt70bo:swop_xwt70
 	{
 		scope=0;
-		class ACE_SelfActions:ACE_SelfActions{
-
-		};
+		class ACE_SelfActions:ACE_SelfActions{};
 	};
 
 	class macro_new_vehicle(X_wing,T_65_MkII) : swop_xw
@@ -174,7 +167,6 @@ class CfgVehicles
 		hiddenSelections[] = {"camo1", "camo2", "start", "start2", "burn", "burn2", "t1l", "t2l", "t1r", "t2r"};
 		hiddenSelectionsTextures[] = {"XT\fusfive.paa", "XT\wingsfive.paa"};
 	};
-
 	class macro_new_vehicle(X_wing,T_65_blue_MkII) : macro_new_vehicle(X_wing,T_65_MkII)
 	{
 		displayname = "X-Wing T-65 (Blue) Mk.II";

addons - Copy/RD501_Vehicles/air/Y_Wing/common.hpp

@@ -8,6 +8,8 @@
 		VTOLRollInfluence = 6*5;
 		gearsUpFrictionCoef = 25;
 
+		class EventHandlers{};
+
 		class Turrets:Turrets
 		{
 			class MainTurret:MainTurret

addons - Copy/RD501_Vehicles/air/hyena/config.cpp

@@ -35,7 +35,6 @@ class CfgPatches
 	};
 };
 
-
 #include "../../common/sensor_templates.hpp"
 class CfgVehicles
 {
@@ -58,10 +57,10 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
 
-		class UserActions
-		{
-			
-		};	
+		class EventHandlers{};
+
+		class UserActions{};
+
 		weapons[] = {
 			macro_new_weapon(wynd,agm),
 			macro_new_weapon(bomb,cluster),

addons - Copy/RD501_Vehicles/air/nantex/config.cpp

@@ -35,7 +35,6 @@ class CfgPatches
 	};
 };
 
-
 #include "../../common/sensor_templates.hpp"
 class CfgVehicles
 {
@@ -60,6 +59,8 @@ class CfgVehicles
 
 		crew=macro_new_unit_class(opfor,B1_pilot)
 
+		class EventHandlers{};
+
 		class ACE_SelfActions:ACE_SelfActions
 		{
 			#include "../../common/universal_hud_color_changer.hpp"

addons - Copy/RD501_Vehicles/air/scimitar/config.cpp

@@ -35,7 +35,6 @@ class CfgPatches
 	};
 };
 
-
 #include "../../common/sensor_templates.hpp"
 class CBA_Extended_EventHandlers_base;
 class CfgVehicles
@@ -58,6 +57,9 @@ class CfgVehicles
 		faction = macro_empire_faction
 		editorSubcategory = macro_editor_cat_air(Empire_vtol)
 		vehicleClass = macro_editor_vehicle_type_air(Empire)
+
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn

addons - Copy/RD501_Vehicles/air/tri_fighter/config.cpp

@@ -69,6 +69,8 @@ class CfgVehicles
 
 		crew=macro_new_unit_class(opfor,B1_pilot)
 
+		class EventHandlers{};
+
 		class UserActions
 		{
 			class AfterburnerOn