Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig

Browse Source
This commit is contained in:
Josuan Albin 2017-11-09 18:32:00 +01:00
parent 8abcbed416
commit 496e6f8223
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/arsenal/defines.hpp
View File

@ -232,9 +232,9 @@
#define LIST_DEFAULTS\ #define LIST_DEFAULTS\
[\ [\
[\ [\
(primaryweapon GVAR(center) call bis_fnc_baseWeapon),\ (primaryweapon GVAR(center) call CBA_fnc_getNonPresetClass),\
(secondaryweapon GVAR(center) call bis_fnc_baseWeapon),\ (secondaryweapon GVAR(center) call CBA_fnc_getNonPresetClass),\
(handgunweapon GVAR(center) call bis_fnc_baseWeapon)\ (handgunweapon GVAR(center) call CBA_fnc_getNonPresetClass)\
],\ ],\
[\ [\
[((GVAR(center) weaponAccessories (primaryWeapon GVAR(center))) select 2), ((GVAR(center) weaponAccessories (secondaryWeapon GVAR(center))) select 2), ((GVAR(center) weaponAccessories (handgunWeapon GVAR(center))) select 2)] select {!(_x isEqualTo "")},\ [((GVAR(center) weaponAccessories (primaryWeapon GVAR(center))) select 2), ((GVAR(center) weaponAccessories (secondaryWeapon GVAR(center))) select 2), ((GVAR(center) weaponAccessories (handgunWeapon GVAR(center))) select 2)] select {!(_x isEqualTo "")},\

6
addons/arsenal/functions/fnc_addVirtualItems.sqf
View File

@ -151,13 +151,13 @@ if (_items isEqualType true && {_items}) then {
{getNumber (_configCfgWeapons >> _x >> 'type') != 4096}): { {getNumber (_configCfgWeapons >> _x >> 'type') != 4096}): {
switch (getNumber (_configCfgWeapons >> _x >> "type")) do { switch (getNumber (_configCfgWeapons >> _x >> "type")) do {
case 1: { case 1: {
(_cargo select 0) select 0 pushBackUnique ([_x] call bis_fnc_baseWeapon); (_cargo select 0) select 0 pushBackUnique ([_x] call CBA_fnc_getNonPresetClass);
}; };
case 2: { case 2: {
(_cargo select 0) select 2 pushBackUnique ([_x] call bis_fnc_baseWeapon); (_cargo select 0) select 2 pushBackUnique ([_x] call CBA_fnc_getNonPresetClass);
}; };
case 4: { case 4: {
(_cargo select 0) select 1 pushBackUnique ([_x] call bis_fnc_baseWeapon); (_cargo select 0) select 1 pushBackUnique ([_x] call CBA_fnc_getNonPresetClass);
}; };
}; };
}; };

8
addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf
View File

@ -62,7 +62,7 @@ switch (GVAR(currentLoadoutsTab)) do {
private _weapon = (_loadout select _dataIndex) select 0; private _weapon = (_loadout select _dataIndex) select 0;
if (_weapon != "") then { if (_weapon != "") then {
private _baseWeapon = _weapon call BIS_fnc_baseWeapon; private _baseWeapon = _weapon call CBA_fnc_getNonPresetClass;
if (_weapon != _baseWeapon) then { if (_weapon != _baseWeapon) then {
(_loadout select _dataIndex) set [0, _baseWeapon]; (_loadout select _dataIndex) set [0, _baseWeapon];
}; };
@ -84,7 +84,7 @@ switch (GVAR(currentLoadoutsTab)) do {
private _weapon = (_x select 0) select 0; private _weapon = (_x select 0) select 0;
if (_weapon != "") then { if (_weapon != "") then {
private _baseWeapon = _weapon call BIS_fnc_baseWeapon; private _baseWeapon = _weapon call CBA_fnc_getNonPresetClass;
if (_weapon != _baseWeapon) then { if (_weapon != _baseWeapon) then {
(_x select 0)set [0, _baseWeapon]; (_x select 0)set [0, _baseWeapon];
}; };
@ -143,7 +143,7 @@ switch (GVAR(currentLoadoutsTab)) do {
private _weapon = (_loadout select _dataIndex) select 0; private _weapon = (_loadout select _dataIndex) select 0;
if (_weapon != "") then { if (_weapon != "") then {
private _baseWeapon = _weapon call BIS_fnc_baseWeapon; private _baseWeapon = _weapon call CBA_fnc_getNonPresetClass;
if (_weapon != _baseWeapon) then { if (_weapon != _baseWeapon) then {
(_loadout select _dataIndex) set [0, _baseWeapon]; (_loadout select _dataIndex) set [0, _baseWeapon];
}; };
@ -165,7 +165,7 @@ switch (GVAR(currentLoadoutsTab)) do {
private _weapon = (_x select 0) select 0; private _weapon = (_x select 0) select 0;
if (_weapon != "") then { if (_weapon != "") then {
private _baseWeapon = _weapon call BIS_fnc_baseWeapon; private _baseWeapon = _weapon call CBA_fnc_getNonPresetClass;
if (_weapon != _baseWeapon) then { if (_weapon != _baseWeapon) then {
(_x select 0)set [0, _baseWeapon]; (_x select 0)set [0, _baseWeapon];
}; };

7
addons/arsenal/functions/fnc_onSelChangedLeft.sqf
View File

@ -31,7 +31,8 @@ private _selectCorrectPanelContainer = [_containerDefaultRightPanel, _display di
switch (GVAR(currentLeftPanel)) do { switch (GVAR(currentLeftPanel)) do {
case IDC_buttonPrimaryWeapon : { case IDC_buttonPrimaryWeapon : {
private _baseWeapon = ((GVAR(currentItems) select 0) call bis_fnc_baseWeapon); private _baseWeapon = (GVAR(currentItems) select 0) call CBA_fnc_getNonPresetClass;
TRACE_2("weapon classes", (GVAR(currentItems) select 0), _baseWeapon);
if ((GVAR(currentItems) select 0) != _item && {_baseWeapon != _item}) then { if ((GVAR(currentItems) select 0) != _item && {_baseWeapon != _item}) then {
{ {
@ -74,7 +75,7 @@ switch (GVAR(currentLeftPanel)) do {
}; };
case IDC_buttonHandgun : { case IDC_buttonHandgun : {
private _baseWeapon = ((GVAR(currentItems) select 2) call bis_fnc_baseWeapon); private _baseWeapon = (GVAR(currentItems) select 2) call CBA_fnc_getNonPresetClass;
if ((GVAR(currentItems) select 2) != _item && {_baseWeapon != _item}) then { if ((GVAR(currentItems) select 2) != _item && {_baseWeapon != _item}) then {
{ {
@ -117,7 +118,7 @@ switch (GVAR(currentLeftPanel)) do {
}; };
case IDC_buttonSecondaryWeapon : { case IDC_buttonSecondaryWeapon : {
private _baseWeapon = ((GVAR(currentItems) select 1) call bis_fnc_baseWeapon); private _baseWeapon = (GVAR(currentItems) select 1) call CBA_fnc_getNonPresetClass;
if ((GVAR(currentItems) select 1) != _item && {_baseWeapon != _item}) then { if ((GVAR(currentItems) select 1) != _item && {_baseWeapon != _item}) then {
{ {