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

Compat GM - Remove ace_hearing hard dependency #10653

Merged
merged 4 commits into from
Jan 13, 2025
Merged

Compat GM - Remove ace_hearing hard dependency #10653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a54ebd3
Remove hard hearing dependency
johnb432 Jan 13, 2025
1edc254
Merge branch 'master' into compat-spe-remove-hard-hearing-dependency
johnb432 Jan 13, 2025
8e8ed7f
Remove hard hearing dependency
johnb432 Jan 13, 2025
8e8955a
Merge branch 'master' into compat-spe-remove-hard-hearing-dependency
johnb432 Jan 13, 2025
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
124 changes: 0 additions & 124 deletions addons/compat_gm/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,128 +54,4 @@ class CfgWeapons {
class gm_p2a1_base: gm_pistol_base {
EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
};

// HELMETS
class gm_ge_headgear_headset_crew_base;
class gm_ge_headgear_headset_crew_oli: gm_ge_headgear_headset_crew_base {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_sph4_base;
class gm_ge_headgear_sph4_oli: gm_ge_headgear_sph4_base {
HEARING_PROTECTION_PELTOR;
};

class gm_pl_headgear_wz63_base;
class gm_pl_army_headgear_wz63_oli: gm_pl_headgear_wz63_base {
HEARING_PROTECTION_PELTOR;
};
class gm_pl_army_headgear_wz63_net_oli: gm_pl_headgear_wz63_base {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_crewhat_80_base;
class gm_ge_headgear_crewhat_80_blk: gm_ge_headgear_crewhat_80_base {
HEARING_PROTECTION_PELTOR;
};

class gm_gc_headgear_crewhat_80_base;
class gm_gc_army_headgear_crewhat_80_blk: gm_gc_headgear_crewhat_80_base {
HEARING_PROTECTION_PELTOR;
};

class gm_gc_headgear_zsh3_base;
class gm_gc_headgear_zsh3_wht: gm_gc_headgear_zsh3_base {
HEARING_PROTECTION_PELTOR;
};
class gm_gc_headgear_zsh3_blu: gm_gc_headgear_zsh3_base {
HEARING_PROTECTION_PELTOR;
};
class gm_gc_headgear_zsh3_orn: gm_gc_headgear_zsh3_base {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_beret_crew_base;
class gm_ge_headgear_beret_crew_blk: gm_ge_headgear_beret_crew_base {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_beret_crew_bdx;
class gm_ge_headgear_beret_crew_grn;
class gm_ge_headgear_beret_crew_red;

class gm_ge_headgear_beret_crew_red_antiair: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_engineer: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_maintenance: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_crew_grn {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_grn_infantry: gm_ge_headgear_beret_crew_grn {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_nbc: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_opcom: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_crew_bdx {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_bdx_lrrp: gm_ge_headgear_beret_crew_bdx {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_bgs_headgear_beret_crew_grn: gm_ge_headgear_beret_crew_grn {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_bgs_headgear_beret_crew_grn_sf: gm_ge_headgear_beret_crew_grn {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_hat_beanie_base;
class gm_ge_headgear_hat_beanie_crew_blk: gm_ge_headgear_hat_beanie_base {
HEARING_PROTECTION_PELTOR;
};

class gm_xx_headgear_headwrap_01_base;
class gm_xx_headgear_headwrap_crew_01_oli: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_m84: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_grn: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_smp: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_blk: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_flk: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_trp: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
};
125 changes: 125 additions & 0 deletions addons/compat_gm/compat_gm_hearing/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
class CfgWeapons {
// HELMETS
class gm_ge_headgear_headset_crew_base;
class gm_ge_headgear_headset_crew_oli: gm_ge_headgear_headset_crew_base {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_sph4_base;
class gm_ge_headgear_sph4_oli: gm_ge_headgear_sph4_base {
HEARING_PROTECTION_PELTOR;
};

class gm_pl_headgear_wz63_base;
class gm_pl_army_headgear_wz63_oli: gm_pl_headgear_wz63_base {
HEARING_PROTECTION_PELTOR;
};
class gm_pl_army_headgear_wz63_net_oli: gm_pl_headgear_wz63_base {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_crewhat_80_base;
class gm_ge_headgear_crewhat_80_blk: gm_ge_headgear_crewhat_80_base {
HEARING_PROTECTION_PELTOR;
};

class gm_gc_headgear_crewhat_80_base;
class gm_gc_army_headgear_crewhat_80_blk: gm_gc_headgear_crewhat_80_base {
HEARING_PROTECTION_PELTOR;
};

class gm_gc_headgear_zsh3_base;
class gm_gc_headgear_zsh3_wht: gm_gc_headgear_zsh3_base {
HEARING_PROTECTION_PELTOR;
};
class gm_gc_headgear_zsh3_blu: gm_gc_headgear_zsh3_base {
HEARING_PROTECTION_PELTOR;
};
class gm_gc_headgear_zsh3_orn: gm_gc_headgear_zsh3_base {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_beret_crew_base;
class gm_ge_headgear_beret_crew_blk: gm_ge_headgear_beret_crew_base {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_beret_crew_bdx;
class gm_ge_headgear_beret_crew_grn;
class gm_ge_headgear_beret_crew_red;

class gm_ge_headgear_beret_crew_red_antiair: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_engineer: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_maintenance: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_crew_grn {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_grn_infantry: gm_ge_headgear_beret_crew_grn {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_nbc: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_opcom: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_crew_bdx {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_bdx_lrrp: gm_ge_headgear_beret_crew_bdx {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_bgs_headgear_beret_crew_grn: gm_ge_headgear_beret_crew_grn {
HEARING_PROTECTION_PELTOR;
};
class gm_ge_bgs_headgear_beret_crew_grn_sf: gm_ge_headgear_beret_crew_grn {
HEARING_PROTECTION_PELTOR;
};

class gm_ge_headgear_hat_beanie_base;
class gm_ge_headgear_hat_beanie_crew_blk: gm_ge_headgear_hat_beanie_base {
HEARING_PROTECTION_PELTOR;
};

class gm_xx_headgear_headwrap_01_base;
class gm_xx_headgear_headwrap_crew_01_oli: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_m84: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_grn: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_smp: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_blk: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_flk: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
class gm_xx_headgear_headwrap_crew_01_trp: gm_xx_headgear_headwrap_01_base {
HEARING_PROTECTION_PELTOR;
};
};
23 changes: 23 additions & 0 deletions addons/compat_gm/compat_gm_hearing/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#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[] = {
"gm_core",
"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_gm/compat_gm_hearing/script_component.hpp
View file
Open in desktop
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"
3 changes: 0 additions & 3 deletions addons/compat_gm/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#include "script_component.hpp"
#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"


class CfgPatches {
class ADDON {
Expand Down
1 change: 0 additions & 1 deletion addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,4 @@ class CfgWeapons {
class H_SPE_GER_ST_Tanker_Cap: H_SPE_GER_Fieldcap {
HEARING_PROTECTION_EARMUFF;
};

};
Loading