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.

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

XEH - Fix missing XEH on GM objects #1426

Merged
merged 1 commit into from
Feb 24, 2021
Merged
Changes from all commits
Commits
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
18 changes: 17 additions & 1 deletion addons/xeh/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,21 @@ class CfgVehicles {
XEH_ENABLED;
};

// Base classes do not exist without GM components. Recreate inheritance tree
// up to existing private/protected base class to pass down necessary entries.
class gm_thingX_base: ThingX {};
class gm_object_base: gm_thingX_base {};
class gm_logistics_object_base: gm_object_base {
XEH_ENABLED;
};

class gm_staticWeapon_base: StaticWeapon {};
class gm_staticMG_base: gm_staticWeapon_base {};
class gm_mg3_aatripod_base: gm_staticMG_base {};
class gm_mg3_aatripod_empty: gm_mg3_aatripod_base {
XEH_ENABLED;
};

// Enoch
class Land_PortableDesk_01_base_F;
class Land_PortableDesk_01_animated_base_F: Land_PortableDesk_01_base_F {
Expand Down Expand Up @@ -353,7 +368,8 @@ class CfgVehicles {
XEH_ENABLED;
};

class Alien_Extractor_01_base_F: Items_base_F {}; // Class does not exist without optional Contact component. Recreate inheritance tree up to mandatory base class.
// Class does not exist without optional Contact component. Recreate inheritance tree up to existing base class.
class Alien_Extractor_01_base_F: Items_base_F {};
class Alien_Extractor_01_generic_base_F: Alien_Extractor_01_base_F {
XEH_ENABLED;
};
Expand Down