Merge branch 'master' into custom-40mm-HEDP

BourbonWarfare · Dec 13, 2024 · f3f6091 · f3f6091
2 parents 404a263 + 38dbc10
commit f3f6091
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/addons/arsenalExport/functions/fnc_export.sqf b/addons/arsenalExport/functions/fnc_export.sqf
@@ -147,12 +147,12 @@ _lines pushBack format ['#define SAM_MAG %1', [GVAR(loadout_sam), GVAR(loadout_s
 _lines pushBack format ["// Sniper"];
 _lines pushBack format ['#define SNIPER "%1"', GVAR(loadout_sniper)];
 _lines pushBack format ['#define SNIPER_MAG %1', [GVAR(loadout_sniper), GVAR(loadout_sniperMags), SNIPER_ROUNDS] call _fnc_getMags];
-_lines pushBack format ['#define SNIPER_OPTIC %1', [GVAR(loadout_sniperAttachments)] call _fnc_formatList];
+_lines pushBack format ['#define SNIPER_ATTACHMENTS %1', [GVAR(loadout_sniperAttachments)] call _fnc_formatList];
 
 _lines pushBack format ["// Spotter"];
 _lines pushBack format ['#define SPOTTER "%1"', GVAR(loadout_spotter)];
 _lines pushBack format ['#define SPOTTER_MAG %1', [GVAR(loadout_spotter), GVAR(loadout_spotterMags), RIFLE_ROUNDS] call _fnc_getMags];
-_lines pushBack format ['#define SPOTTER_OPTIC %1', [GVAR(loadout_spotterAttachments)] call _fnc_formatList];
+_lines pushBack format ['#define SPOTTER_ATTACHMENTS %1', [GVAR(loadout_spotterAttachments)] call _fnc_formatList];
 
 _lines pushBack format ["// SMG"];
 _lines pushBack format ['#define SMG "%1"', GVAR(loadout_smg)];
@@ -161,7 +161,7 @@ _lines pushBack format ['#define SMG_MAG %1', [GVAR(loadout_smg), GVAR(loadout_s
 _lines pushBack format ["// Pistol"];
 _lines pushBack format ['#define PISTOL "%1"', GVAR(loadout_pistol)];
 _lines pushBack format ['#define PISTOL_MAG %1', [GVAR(loadout_pistol), GVAR(loadout_pistolMags), PISTOL_ROUNDS] call _fnc_getMags];
-_lines pushBack format ['#define PISTOL_OPTIC %1', [GVAR(loadout_pistolAttachments)] call _fnc_formatList];
+_lines pushBack format ['#define PISTOL_ATTACHMENTS %1', [GVAR(loadout_pistolAttachments)] call _fnc_formatList];
 
 _lines pushBack format ["// Grenades"];
 _lines pushBack format ["#define LEADER_GRENADES BASE_FRAG,LEADER_SMOKES,SIDE_CHEM_LIGHT"];

diff --git a/addons/zeusHC/config.cpp b/addons/zeusHC/config.cpp
@@ -10,6 +10,7 @@ class CfgPatches {
             QGVAR(east_manpad),
             QGVAR(east_manpadTeam),
             QGVAR(east_matTeam),
+            QGVAR(east_mmgTeam),
             QGVAR(east_patrol),
             QGVAR(east_fireteam),
             QGVAR(east_squad),
@@ -73,6 +74,7 @@ class CfgPatches {
             QGVAR(west_manpad),
             QGVAR(west_manpadTeam),
             QGVAR(west_matTeam),
+            QGVAR(west_mmgTeam),
             QGVAR(west_patrol),
             QGVAR(west_fireteam),
             QGVAR(west_squad),
@@ -146,6 +148,7 @@ class CfgPatches {
             QGVAR(ind_manpad),
             QGVAR(ind_manpadTeam),
             QGVAR(ind_matTeam),
+            QGVAR(ind_mmgTeam),
             QGVAR(ind_patrol),
             QGVAR(ind_fireteam),
             QGVAR(ind_squad),