Refuel - Cleanup compats (acemod#10011)

* Refuel - Cleanup compats * add `XEH_INHERITED`
blake8090 · Aug 18, 2024 · 682ebee · 682ebee
1 parent bf8fa09
commit 682ebee
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 46 deletions.
diff --git a/addons/compat_cup_terrains/CfgVehicles.hpp b/addons/compat_cup_terrains/CfgVehicles.hpp
@@ -1,11 +1,14 @@
+class CBA_Extended_EventHandlers;
+#define XEH_INHERITED class EventHandlers {class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};}
+
 class CfgVehicles {
     class House;
     class House_Small_F;
     class Strategic;
     class House_EP1: House {};
 
     class Land_Benzina_schnell: House {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{-1.5,-3.93,-1.25}, {2.35,-3.93,-1.25}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
         class ACE_Actions {
@@ -18,22 +21,22 @@ class CfgVehicles {
         };
     };
     class Land_A_FuelStation_Feed: Strategic {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{-0.34,0,0}, {0.34,0,0}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
     };
     class Land_Ind_FuelStation_Feed_EP1: House_EP1 {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{-0.34,0,0}, {0.34,0,0}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
     };
     class Land_FuelStation_Feed_PMC: Strategic {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{-0.34,0,0}, {0.34,0,0}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
     };
     class FuelStation: House_Small_F {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{1.25, .2, -1.1}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
         class ACE_Actions {
@@ -45,4 +48,9 @@ class CfgVehicles {
             };
         };
     };
+    class WarfareBBaseStructure;
+    class Base_WarfareBVehicleServicePoint: WarfareBBaseStructure {
+        // "vehicle service point" (a conex /w barrels) - need hooks???
+        XEH_INHERITED;
+    };
 };
diff --git a/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp b/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp
@@ -1,35 +1,30 @@
 class CfgVehicles {
     class CUP_T810_Unarmed_Base;
     class CUP_T810_Refuel_Base: CUP_T810_Unarmed_Base {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-1.01, 0.21, -0.5},{1.08, 0.2, -0.5}};
         EGVAR(refuel,fuelCargo) = 10000;
     };
 
     class Truck_02_fuel_base_F;
     class CUP_Kamaz_5350_Refuel_Base: Truck_02_fuel_base_F {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-0.02, -3.33, -1.05}};
         EGVAR(refuel,fuelCargo) = 10000;
     };
 
     class CUP_Ural_Support_Base;
     class CUP_Ural_Refuel_Base: CUP_Ural_Support_Base {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-0.05, -3.65, -0.42}};
         EGVAR(refuel,fuelCargo) = 10000;
     };
 
     class CUP_V3S_Open_Base;
     class CUP_V3S_Refuel_Base: CUP_V3S_Open_Base {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-0.35, -3.35, -0.4},{0.40, -3.35, -0.4}};
         EGVAR(refuel,fuelCargo) = 6500;
     };
 
     class CUP_MTVR_Base;
     class CUP_MTVR_Refuel_Base: CUP_MTVR_Base {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-1.09, -0.01, -0.5},{1, -0.01, -0.5}};
         EGVAR(refuel,fuelCargo) = 10000;
     };

diff --git a/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp b/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp
diff --git a/addons/compat_gm/compat_gm_refuel/config.cpp b/addons/compat_gm/compat_gm_refuel/config.cpp
@@ -21,4 +21,3 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
-#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/CfgVehicles.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/CfgVehicles.hpp
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp
@@ -18,4 +18,4 @@ class CfgPatches {
     };
 };
 
-#include "CfgVehicles.hpp"
+// ADDON kept for backward compatiblity
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
@@ -21,4 +21,3 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
-#include "CfgVehicles.hpp"
diff --git a/addons/compat_sog/CfgVehicles/wheeled.hpp b/addons/compat_sog/CfgVehicles/wheeled.hpp
@@ -5,7 +5,6 @@ class vn_wheeled_m54_base: vn_wheeled_truck_base {
 };
 class vn_wheeled_m54_cab_base;
 class vn_wheeled_m54_fuel_base: vn_wheeled_m54_cab_base {
-    transportFuel = 0;
     EGVAR(refuel,hooks)[] = {{-1.15, -2.3, 0.28}};
     EGVAR(refuel,fuelCargo) = 4542;
 };
@@ -25,7 +24,6 @@ class vn_wheeled_z157_base: vn_wheeled_truck_base {
     EGVAR(refuel,fuelCapacity) = 150;
 };
 class vn_wheeled_z157_fuel_base: vn_wheeled_z157_base {
-    transportFuel = 0;
     EGVAR(refuel,hooks)[] = {{-1.36, -3.575, -0.4}};
     EGVAR(refuel,fuelCargo) = 4000;
 };