Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RHS Compat - Fix GREF canoes refuel interaction #6575

Merged
merged 3 commits into from
Sep 15, 2018
Merged

RHS Compat - Fix GREF canoes refuel interaction #6575

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8b9a99
Fix RHS GREF canoes refuel interaction
Wakbub Sep 15, 2018
2929a7d
Removed ace_refuel from requiredAddons
Wakbub Sep 15, 2018
0f8cd3f
fix inheritance
commy2 Sep 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions optionals/compat_rhs_gref3/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just need the parent class of this.

// Canoes are propelled by paddlers
EGVAR(refuel,canReceive) = 0;
};
};
4 changes: 3 additions & 1 deletion optionals/compat_rhs_gref3/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't want ace_refuel here as we want to keep it optional/modular

author = ECSTRING(common,ACETeam);
authors[] = {"PabstMirror", "Ruthberg", "Anton"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
Expand All @@ -16,3 +17,4 @@ class CfgPatches {
#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"
#include "CfgWeapons.hpp"
#include "CfgVehicles.hpp"