From 5326d0acf54b90c252bf4657eabb8be396bb6851 Mon Sep 17 00:00:00 2001 From: Neviothr Date: Tue, 18 Aug 2020 20:49:53 +0300 Subject: [PATCH] ACE Arsenal - fix #6591, PCML has no ammo (#7850) As per @Superxpdude comment - https://github.com/acemod/ACE3/issues/6591#issuecomment-667706600 --- addons/arsenal/functions/fnc_scanConfig.sqf | 2 +- addons/main/script_macros.hpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/arsenal/functions/fnc_scanConfig.sqf b/addons/arsenal/functions/fnc_scanConfig.sqf index 2bddbf4c5c..e5bc4e6571 100644 --- a/addons/arsenal/functions/fnc_scanConfig.sqf +++ b/addons/arsenal/functions/fnc_scanConfig.sqf @@ -142,7 +142,7 @@ private _putList = []; switch true do { // Rifle, handgun, secondary weapons mags case ( - ((getNumber (_x >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW,TYPE_MAGAZINE_SECONDARY_AND_PUT,1536,TYPE_MAGAZINE_HANDGUN_AND_GL]) || + ((getNumber (_x >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW,TYPE_MAGAZINE_SECONDARY_AND_PUT,1536,TYPE_MAGAZINE_HANDGUN_AND_GL,TYPE_MAGAZINE_MISSILE]) || {(getNumber (_x >> QGVAR(hide))) == -1}) && {!(_className in _grenadeList)} && {!(_className in _putList)} diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index fd779b4014..ac111ce7b2 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -68,6 +68,7 @@ #define TYPE_MAGAZINE_HANDGUN_AND_GL 16 // mainly #define TYPE_MAGAZINE_PRIMARY_AND_THROW 256 #define TYPE_MAGAZINE_SECONDARY_AND_PUT 512 // mainly +#define TYPE_MAGAZINE_MISSILE 768 // more types #define TYPE_BINOCULAR_AND_NVG 4096 #define TYPE_WEAPON_VEHICLE 65536