From 9af445a62320b95638d00d736930836902326d80 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 6 May 2024 21:13:47 -0500 Subject: [PATCH 1/3] Arsenal - Changes for CBA Disposable hashs --- addons/arsenal/functions/fnc_onSelChangedRight.sqf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/arsenal/functions/fnc_onSelChangedRight.sqf b/addons/arsenal/functions/fnc_onSelChangedRight.sqf index ccb29887651..572c660c12e 100644 --- a/addons/arsenal/functions/fnc_onSelChangedRight.sqf +++ b/addons/arsenal/functions/fnc_onSelChangedRight.sqf @@ -69,7 +69,14 @@ switch (_currentItemsIndex) do { // Secondary weapon case IDX_CURR_SECONDARY_WEAPON_ITEMS: { private _currentItemInSlot = (GVAR(currentItems) select IDX_CURR_SECONDARY_WEAPON_ITEMS) select _itemIndex; - private _isDisposable = CBA_disposable_replaceDisposableLauncher && {!isNil {CBA_disposable_loadedLaunchers getVariable (secondaryWeapon GVAR(center))}}; + private _isDisposable = CBA_disposable_replaceDisposableLauncher && {!isNil "CBA_disposable_loadedLaunchers"} && + { + if (typeName CBA_disposable_loadedLaunchers == "HASHMAP") then { // after cba 3.18 + (secondaryWeapon GVAR(center)) in CBA_disposable_loadedLaunchers + } else { + (secondaryWeapon GVAR(center)) in allVariables CBA_disposable_loadedLaunchers + } + }; // If removal if (_item == "") then { From 4394e3954083b06948bc3fdffa7044adc6976d2c Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 15 May 2024 17:14:07 -0500 Subject: [PATCH 2/3] Update addons/arsenal/functions/fnc_onSelChangedRight.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> --- addons/arsenal/functions/fnc_onSelChangedRight.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/arsenal/functions/fnc_onSelChangedRight.sqf b/addons/arsenal/functions/fnc_onSelChangedRight.sqf index 572c660c12e..d291409e851 100644 --- a/addons/arsenal/functions/fnc_onSelChangedRight.sqf +++ b/addons/arsenal/functions/fnc_onSelChangedRight.sqf @@ -71,7 +71,7 @@ switch (_currentItemsIndex) do { private _currentItemInSlot = (GVAR(currentItems) select IDX_CURR_SECONDARY_WEAPON_ITEMS) select _itemIndex; private _isDisposable = CBA_disposable_replaceDisposableLauncher && {!isNil "CBA_disposable_loadedLaunchers"} && { - if (typeName CBA_disposable_loadedLaunchers == "HASHMAP") then { // after cba 3.18 + if (CBA_disposable_loadedLaunchers isEqualType createHashMap) then { // after CBA 3.18 (secondaryWeapon GVAR(center)) in CBA_disposable_loadedLaunchers } else { (secondaryWeapon GVAR(center)) in allVariables CBA_disposable_loadedLaunchers From 7429c2ffd57750c57559736468ff6b210bac86e5 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 15 May 2024 17:14:32 -0500 Subject: [PATCH 3/3] Update addons/arsenal/functions/fnc_onSelChangedRight.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> --- addons/arsenal/functions/fnc_onSelChangedRight.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/arsenal/functions/fnc_onSelChangedRight.sqf b/addons/arsenal/functions/fnc_onSelChangedRight.sqf index d291409e851..abec68ceeef 100644 --- a/addons/arsenal/functions/fnc_onSelChangedRight.sqf +++ b/addons/arsenal/functions/fnc_onSelChangedRight.sqf @@ -74,7 +74,7 @@ switch (_currentItemsIndex) do { if (CBA_disposable_loadedLaunchers isEqualType createHashMap) then { // after CBA 3.18 (secondaryWeapon GVAR(center)) in CBA_disposable_loadedLaunchers } else { - (secondaryWeapon GVAR(center)) in allVariables CBA_disposable_loadedLaunchers + !isNil {CBA_disposable_loadedLaunchers getVariable (secondaryWeapon player)} } };