From e8b9a998c0457e18facdd329dea2ef98f4f459dc Mon Sep 17 00:00:00 2001 From: Wakbub Date: Sat, 15 Sep 2018 14:54:45 +0200 Subject: [PATCH 1/3] Fix RHS GREF canoes refuel interaction --- optionals/compat_rhs_gref3/CfgVehicles.hpp | 12 ++++++++++++ optionals/compat_rhs_gref3/config.cpp | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 optionals/compat_rhs_gref3/CfgVehicles.hpp diff --git a/optionals/compat_rhs_gref3/CfgVehicles.hpp b/optionals/compat_rhs_gref3/CfgVehicles.hpp new file mode 100644 index 00000000000..68ed89994f7 --- /dev/null +++ b/optionals/compat_rhs_gref3/CfgVehicles.hpp @@ -0,0 +1,12 @@ +class CfgVehicles { + class All; + class AllVehicles: All {}; + class Ship: AllVehicles {}; + class Ship_F: Ship {}; + class Boat_F: Ship_F {}; + class Rubber_duck_base_F: Boat_F {}; + class rhsgref_canoe_base: Rubber_duck_base_F { + // Canoes are propelled by paddlers + EGVAR(refuel,canReceive) = 0; + }; +}; diff --git a/optionals/compat_rhs_gref3/config.cpp b/optionals/compat_rhs_gref3/config.cpp index 60b5032dd1c..5d6d61672e4 100644 --- a/optionals/compat_rhs_gref3/config.cpp +++ b/optionals/compat_rhs_gref3/config.cpp @@ -6,8 +6,9 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"rhsgref_main", "rhsgref_c_weapons"}; + requiredAddons[] = {"ace_refuel", "rhsgref_main", "rhsgref_c_weapons"}; author = ECSTRING(common,ACETeam); + authors[] = {"PabstMirror", "Ruthberg", "Anton"}; url = ECSTRING(main,URL); VERSION_CONFIG; }; @@ -16,3 +17,4 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "CfgMagazines.hpp" #include "CfgWeapons.hpp" +#include "CfgVehicles.hpp" From 2929a7d67fe39dabe33489750b4a3756acd78be2 Mon Sep 17 00:00:00 2001 From: Wakbub Date: Sat, 15 Sep 2018 15:08:09 +0200 Subject: [PATCH 2/3] Removed ace_refuel from requiredAddons --- optionals/compat_rhs_gref3/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optionals/compat_rhs_gref3/config.cpp b/optionals/compat_rhs_gref3/config.cpp index 5d6d61672e4..a8f8e147735 100644 --- a/optionals/compat_rhs_gref3/config.cpp +++ b/optionals/compat_rhs_gref3/config.cpp @@ -6,7 +6,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_refuel", "rhsgref_main", "rhsgref_c_weapons"}; + requiredAddons[] = {"rhsgref_main", "rhsgref_c_weapons"}; author = ECSTRING(common,ACETeam); authors[] = {"PabstMirror", "Ruthberg", "Anton"}; url = ECSTRING(main,URL); From 0f8cd3fba88fc5430164905251de9ead38427a47 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 15 Sep 2018 18:47:59 +0200 Subject: [PATCH 3/3] fix inheritance --- optionals/compat_rhs_gref3/CfgVehicles.hpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/optionals/compat_rhs_gref3/CfgVehicles.hpp b/optionals/compat_rhs_gref3/CfgVehicles.hpp index 68ed89994f7..3ac81df2fe3 100644 --- a/optionals/compat_rhs_gref3/CfgVehicles.hpp +++ b/optionals/compat_rhs_gref3/CfgVehicles.hpp @@ -1,10 +1,5 @@ class CfgVehicles { - class All; - class AllVehicles: All {}; - class Ship: AllVehicles {}; - class Ship_F: Ship {}; - class Boat_F: Ship_F {}; - class Rubber_duck_base_F: Boat_F {}; + class Rubber_duck_base_F; class rhsgref_canoe_base: Rubber_duck_base_F { // Canoes are propelled by paddlers EGVAR(refuel,canReceive) = 0;