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

Flashsuppressors - Update muzzle configs #7285

Merged
merged 1 commit into from
Nov 27, 2019
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
26 changes: 19 additions & 7 deletions addons/flashsuppressors/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,35 @@ class asdg_MuzzleSlot_762MG: asdg_MuzzleSlot { // for 7.62, 6.5 and 5.56 univers
ACE_muzzle_mzls_B = 1;
};
};

// Vanilla Muzzles from 1.94+ (ref https://github.com/CBATeam/CBA_A3/pull/1184)
class MuzzleSlot;
class MuzzleSlot_65: MuzzleSlot {
class compatibleItems {
ACE_muzzle_mzls_H = 1;
};
};
class MuzzleSlot_556: MuzzleSlot {
class compatibleItems {
ACE_muzzle_mzls_L = 1;
};
};
class MuzzleSlot_762: MuzzleSlot {
class compatibleItems {
ACE_muzzle_mzls_B = 1;
};
};

class CfgWeapons {
class Rifle_Base_F;

class Rifle_Long_Base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};

/* Other */
class LMG_Mk200_F: Rifle_Long_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762MG {
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
class MuzzleSlot: MuzzleSlot_65 {
compatibleItems[] += {"ACE_muzzle_mzls_H"}; // uses array instead of inherited class
};
};
};
Expand Down