Merge pull request #3813 from acemod/cbaGetItemObjectConfig

Use new CBA get config functions and deprecate ACE functions
This commit is contained in:
commy2 2016-05-30 21:00:05 +02:00
commit 882aa26ab2
3 changed files with 8 additions and 16 deletions

View File

@ -12,12 +12,6 @@
*/
#include "script_component.hpp"
params ["_item"];
ACE_DEPRECATED("ace_common_fnc_getConfigType","3.8.0","CBA_fnc_getItemConfig");
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])

View File

@ -12,10 +12,6 @@
*/
#include "script_component.hpp"
params ["_object"];
ACE_DEPRECATED("ace_common_fnc_getConfigTypeObject","3.8.0","CBA_fnc_getObjectConfig");
if (isClass (configFile >> "CfgVehicles" >> _object)) exitWith {"CfgVehicles"};
if (isClass (configFile >> "CfgAmmo" >> _object)) exitWith {"CfgAmmo"};
""
configName (configHierarchy (_item call CBA_fnc_getObjectConfig) param [1, configNull])

View File

@ -15,9 +15,11 @@
params ["_item"];
private _cfgType = [_item] call FUNC(getConfigType);
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"]};