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

Compat EF - Remove ace_hearing hard dependency #10646

Merged
merged 1 commit into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
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
19 changes: 0 additions & 19 deletions addons/compat_ef/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,6 @@ class CfgWeapons {
EGVAR(nightvision,border) = QPATHTOEF(nightvision,data\nvg_mask_binos_4096.paa);
};

// -- ace_hearing --
class HelmetBase;
class EF_H_Protecta: HelmetBase {
HEARING_PROTECTION_PELTOR;
};
class EF_H_MCH; // this does not have peltor
class EF_H_MCH_Basic: EF_H_MCH {
HEARING_PROTECTION_PELTOR;
};
class EF_H_MCH_BasicNet_Des: EF_H_MCH {
HEARING_PROTECTION_PELTOR;
};
class EF_H_MCH_Full: EF_H_MCH {
HEARING_PROTECTION_PELTOR;
};
class EF_H_MCH_FullCamo_Des: EF_H_MCH {
HEARING_PROTECTION_PELTOR;
};

// -- ace_overpressure --
class autocannon_30mm;
class EF_autocannon_50mm_AAV9: autocannon_30mm {
Expand Down
19 changes: 19 additions & 0 deletions addons/compat_ef/compat_ef_hearing/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
class CfgWeapons {
class HelmetBase;
class EF_H_Protecta: HelmetBase {
HEARING_PROTECTION_PELTOR;
};
class EF_H_MCH; // this does not have peltor
class EF_H_MCH_Basic: EF_H_MCH {
HEARING_PROTECTION_PELTOR;
};
class EF_H_MCH_BasicNet_Des: EF_H_MCH {
HEARING_PROTECTION_PELTOR;
};
class EF_H_MCH_Full: EF_H_MCH {
HEARING_PROTECTION_PELTOR;
};
class EF_H_MCH_FullCamo_Des: EF_H_MCH {
HEARING_PROTECTION_PELTOR;
};
};
19 changes: 19 additions & 0 deletions addons/compat_ef/compat_ef_hearing/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#include "script_component.hpp"
#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"

class CfgPatches {
class SUBADDON {
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"EF_Weapons", "EF_Marines", "ace_hearing"};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
url = ECSTRING(main,URL);
VERSION_CONFIG;
addonRootClass = QUOTE(ADDON);
};
};

#include "CfgWeapons.hpp"
3 changes: 3 additions & 0 deletions addons/compat_ef/compat_ef_hearing/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#define SUBCOMPONENT hearing
#define SUBCOMPONENT_BEAUTIFIED Hearing
#include "..\script_component.hpp"
1 change: 0 additions & 1 deletion addons/compat_ef/config.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "script_component.hpp"
#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"

class CfgPatches {
class ADDON {
Expand Down
Loading