From d35e89892c3ac56ced5bf23ec2619f6bf1e34e83 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sun, 22 May 2016 15:36:31 +0200 Subject: [PATCH 1/2] Use new get item and object config CBA functions, deprecate ACE functions --- addons/common/functions/fnc_getConfigType.sqf | 2 ++ addons/common/functions/fnc_getConfigTypeObject.sqf | 2 ++ addons/common/functions/fnc_getItemType.sqf | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/common/functions/fnc_getConfigType.sqf b/addons/common/functions/fnc_getConfigType.sqf index 1496cfa2b9..f5287f8716 100644 --- a/addons/common/functions/fnc_getConfigType.sqf +++ b/addons/common/functions/fnc_getConfigType.sqf @@ -12,6 +12,8 @@ */ #include "script_component.hpp" +ACE_DEPRECATED("ace_common_fnc_getConfigType","3.8.0","CBA_fnc_getItemConfig"); + params ["_item"]; if (isClass (configFile >> "CfgWeapons" >> _item)) exitWith {"CfgWeapons"}; diff --git a/addons/common/functions/fnc_getConfigTypeObject.sqf b/addons/common/functions/fnc_getConfigTypeObject.sqf index 6186ad6bff..d11c19d5fb 100644 --- a/addons/common/functions/fnc_getConfigTypeObject.sqf +++ b/addons/common/functions/fnc_getConfigTypeObject.sqf @@ -12,6 +12,8 @@ */ #include "script_component.hpp" +ACE_DEPRECATED("ace_common_fnc_getConfigTypeObject","3.8.0","CBA_fnc_getObjectConfig"); + params ["_object"]; if (isClass (configFile >> "CfgVehicles" >> _object)) exitWith {"CfgVehicles"}; diff --git a/addons/common/functions/fnc_getItemType.sqf b/addons/common/functions/fnc_getItemType.sqf index d3eb511949..e35fe67b00 100644 --- a/addons/common/functions/fnc_getItemType.sqf +++ b/addons/common/functions/fnc_getItemType.sqf @@ -15,7 +15,7 @@ params ["_item"]; -private _cfgType = [_item] call FUNC(getConfigType); +private _cfgType = [_item] call CBA_fnc_getItemConfig; if (_cfgType == "") exitWith {["", ""]}; From bd0e05d7d687f15b882ebb11477c56e47c9d8054 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sun, 22 May 2016 16:18:24 +0200 Subject: [PATCH 2/2] Use CBA config functions, return correct value --- addons/common/functions/fnc_getConfigType.sqf | 10 +--------- addons/common/functions/fnc_getConfigTypeObject.sqf | 8 +------- addons/common/functions/fnc_getItemType.sqf | 6 ++++-- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/addons/common/functions/fnc_getConfigType.sqf b/addons/common/functions/fnc_getConfigType.sqf index f5287f8716..34aaa03172 100644 --- a/addons/common/functions/fnc_getConfigType.sqf +++ b/addons/common/functions/fnc_getConfigType.sqf @@ -14,12 +14,4 @@ ACE_DEPRECATED("ace_common_fnc_getConfigType","3.8.0","CBA_fnc_getItemConfig"); -params ["_item"]; - -if (isClass (configFile >> "CfgWeapons" >> _item)) exitWith {"CfgWeapons"}; - -if (isClass (configFile >> "CfgMagazines" >> _item)) exitWith {"CfgMagazines"}; - -if (isClass (configFile >> "CfgGlasses" >> _item)) exitWith {"CfgGlasses"}; - -"" +configName (configHierarchy (_item call CBA_fnc_getItemConfig) param [1, configNull]) diff --git a/addons/common/functions/fnc_getConfigTypeObject.sqf b/addons/common/functions/fnc_getConfigTypeObject.sqf index d11c19d5fb..92a6d43a42 100644 --- a/addons/common/functions/fnc_getConfigTypeObject.sqf +++ b/addons/common/functions/fnc_getConfigTypeObject.sqf @@ -14,10 +14,4 @@ ACE_DEPRECATED("ace_common_fnc_getConfigTypeObject","3.8.0","CBA_fnc_getObjectConfig"); -params ["_object"]; - -if (isClass (configFile >> "CfgVehicles" >> _object)) exitWith {"CfgVehicles"}; - -if (isClass (configFile >> "CfgAmmo" >> _object)) exitWith {"CfgAmmo"}; - -"" +configName (configHierarchy (_item call CBA_fnc_getObjectConfig) param [1, configNull]) diff --git a/addons/common/functions/fnc_getItemType.sqf b/addons/common/functions/fnc_getItemType.sqf index e35fe67b00..eb5015e20a 100644 --- a/addons/common/functions/fnc_getItemType.sqf +++ b/addons/common/functions/fnc_getItemType.sqf @@ -15,9 +15,11 @@ params ["_item"]; -private _cfgType = [_item] call CBA_fnc_getItemConfig; +private _config = _item call CBA_fnc_getItemConfig; -if (_cfgType == "") exitWith {["", ""]}; +if (isNull _config) exitWith {["", ""]}; + +private _cfgType = configName ((configHierarchy _config) param [1, configNull]); if (_cfgType == "CfgGlasses") exitWith {["item", "glasses"]};