From c591c7af64e60525ce0561c0c96fcaa7c7e2bf52 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Thu, 12 May 2016 21:30:32 +0200
Subject: [PATCH 1/3] Add interaction support to Motorcycle class
---
addons/interaction/CfgVehicles.hpp | 26 ++++++++++++++++++++++++++
addons/repair/CfgEventHandlers.hpp | 6 ++++++
addons/repair/CfgVehicles.hpp | 4 ++++
3 files changed, 36 insertions(+)
diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index 6b6e0e69b0..b1c1cf852f 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -355,6 +355,32 @@ class CfgVehicles {
};
};
+ class Motorcycle: LandVehicle {
+ class ACE_Actions {
+ class ACE_MainActions {
+ displayName = CSTRING(MainAction);
+ selection = "";
+ distance = 10;
+ condition = "true";
+ class ACE_Passengers {
+ displayName = CSTRING(Passengers);
+ condition = "true";
+ statement = "";
+ insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
+ };
+ };
+ };
+
+ class ACE_SelfActions {
+ class ACE_Passengers {
+ displayName = CSTRING(Passengers);
+ condition = "true";
+ statement = "";
+ insertChildren = QUOTE(_this call DFUNC(addPassengersActions));
+ };
+ };
+ };
+
class Air;
class Helicopter: Air {
class ACE_Actions {
diff --git a/addons/repair/CfgEventHandlers.hpp b/addons/repair/CfgEventHandlers.hpp
index 06647d8dd5..f10cccba3a 100644
--- a/addons/repair/CfgEventHandlers.hpp
+++ b/addons/repair/CfgEventHandlers.hpp
@@ -31,6 +31,12 @@ class Extended_InitPost_EventHandlers {
serverInit = QUOTE(_this call DFUNC(addSpareParts));
};
};
+ class Motorcycle {
+ class ADDON {
+ init = QUOTE(_this call DFUNC(addRepairActions));
+ serverInit = QUOTE(_this call DFUNC(addSpareParts));
+ };
+ };
class Helicopter {
class ADDON {
init = QUOTE(_this call DFUNC(addRepairActions));
diff --git a/addons/repair/CfgVehicles.hpp b/addons/repair/CfgVehicles.hpp
index 0a1d6f55dc..da5f42e9a8 100644
--- a/addons/repair/CfgVehicles.hpp
+++ b/addons/repair/CfgVehicles.hpp
@@ -290,6 +290,10 @@ class CfgVehicles {
MACRO_REPAIRVEHICLE
};
+ class Motorcycle: LandVehicle {
+ MACRO_REPAIRVEHICLE
+ };
+
class Air;
class Helicopter: Air {
MACRO_REPAIRVEHICLE
From f6e4bd7a6b42a43f37d6984820691415cdc5cff5 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Thu, 12 May 2016 21:37:54 +0200
Subject: [PATCH 2/3] Remove redundant spare part adding
---
addons/repair/CfgEventHandlers.hpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/addons/repair/CfgEventHandlers.hpp b/addons/repair/CfgEventHandlers.hpp
index f10cccba3a..2d8f54b725 100644
--- a/addons/repair/CfgEventHandlers.hpp
+++ b/addons/repair/CfgEventHandlers.hpp
@@ -28,13 +28,11 @@ class Extended_InitPost_EventHandlers {
class Tank {
class ADDON {
init = QUOTE(_this call DFUNC(addRepairActions));
- serverInit = QUOTE(_this call DFUNC(addSpareParts));
};
};
class Motorcycle {
class ADDON {
init = QUOTE(_this call DFUNC(addRepairActions));
- serverInit = QUOTE(_this call DFUNC(addSpareParts));
};
};
class Helicopter {
From 2d2d5bc828366b5168a477c2557e2a9f26792c0e Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Thu, 12 May 2016 21:52:06 +0200
Subject: [PATCH 3/3] Readd mistakenly removed spare part adding
---
addons/repair/CfgEventHandlers.hpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/repair/CfgEventHandlers.hpp b/addons/repair/CfgEventHandlers.hpp
index 2d8f54b725..f38dc21d23 100644
--- a/addons/repair/CfgEventHandlers.hpp
+++ b/addons/repair/CfgEventHandlers.hpp
@@ -28,6 +28,7 @@ class Extended_InitPost_EventHandlers {
class Tank {
class ADDON {
init = QUOTE(_this call DFUNC(addRepairActions));
+ serverInit = QUOTE(_this call DFUNC(addSpareParts));
};
};
class Motorcycle {