diff --git a/addons/common/fnc_getObjectConfig.sqf b/addons/common/fnc_getObjectConfig.sqf index 7bdf067e7..4bc5094f5 100644 --- a/addons/common/fnc_getObjectConfig.sqf +++ b/addons/common/fnc_getObjectConfig.sqf @@ -25,8 +25,8 @@ SCRIPT(getObjectConfig); params [["_object", "", ["", objNull]]]; -if (_object isEqualType objNull) then { - _object = typeOf _object; +if (_object isEqualType objNull) exitWith { + configOf _object }; private _result = configNull; diff --git a/addons/common/fnc_isTurnedOut.sqf b/addons/common/fnc_isTurnedOut.sqf index ee1a8302c..aab149640 100644 --- a/addons/common/fnc_isTurnedOut.sqf +++ b/addons/common/fnc_isTurnedOut.sqf @@ -34,7 +34,7 @@ params ["_unit"]; private _out = false; private _vehicle = vehicle _unit; -private _cfg = configFile >> "CfgVehicles" >> typeOf _vehicle; +private _cfg = configOf _vehicle; if (_vehicle != _unit) then { if (driver _vehicle == _unit) then { diff --git a/addons/common/fnc_randomizeFacewear.sqf b/addons/common/fnc_randomizeFacewear.sqf index f14fdd655..8c03a74a7 100644 --- a/addons/common/fnc_randomizeFacewear.sqf +++ b/addons/common/fnc_randomizeFacewear.sqf @@ -43,7 +43,7 @@ private _randomizationDisabled = getArray (missionConfigFile >> "disableRandomiz if (_randomizationDisabled || {!(_unit getVariable ["BIS_enableRandomization", true])}) exitWith {true}; // Get list -private _facewearList = getArray (configFile >> "CfgVehicles" >> typeOf _unit >> "CBA_facewearList"); +private _facewearList = getArray (configOf _unit >> "CBA_facewearList"); if (_facewearList isEqualTo []) exitWith {true}; // Apply diff --git a/addons/disposable/fnc_replaceMagazineCargo.sqf b/addons/disposable/fnc_replaceMagazineCargo.sqf index 7e9e2ce55..a01682b11 100644 --- a/addons/disposable/fnc_replaceMagazineCargo.sqf +++ b/addons/disposable/fnc_replaceMagazineCargo.sqf @@ -50,7 +50,7 @@ if (magazineCargo _box arrayIntersect GVAR(magazines) isEqualTo []) exitWith {}; private _magazines = magazinesAmmoCargo _box; clearMagazineCargoGlobal _box; -private _isBackpack = getNumber (configFile >> "CfgVehicles" >> typeOf _box >> "isBackpack") != -1; +private _isBackpack = getNumber (configOf _box >> "isBackpack") != -1; { _x params ["_magazine", "_ammo"]; diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index 79d999fd3..8a87dff73 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -10,7 +10,7 @@ #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD // MINIMAL required version for the Mod. Components can specify others.. -#define REQUIRED_VERSION 1.98 +#define REQUIRED_VERSION 2.00 /* // Defined DEBUG_MODE_NORMAL in a few CBA_fncs to prevent looped logging :) diff --git a/addons/optics/fnc_currentOptic.sqf b/addons/optics/fnc_currentOptic.sqf index 8d7c4effa..01d4f176e 100644 --- a/addons/optics/fnc_currentOptic.sqf +++ b/addons/optics/fnc_currentOptic.sqf @@ -32,7 +32,7 @@ private _vehicleOptic = ""; if (_vehicle != _unit) then { // todo: turrets - _vehicleOptic = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "CBA_ScriptedOpticClass"); + _vehicleOptic = getText (configOf _vehicle >> "CBA_ScriptedOpticClass"); }; if (_vehicleOptic != "") exitWith {_vehicleOptic}; diff --git a/addons/xeh/fnc_initEvents.sqf b/addons/xeh/fnc_initEvents.sqf index ff26fa3b5..02b834db8 100644 --- a/addons/xeh/fnc_initEvents.sqf +++ b/addons/xeh/fnc_initEvents.sqf @@ -26,7 +26,7 @@ params ["_unit"]; if !(ISPROCESSED(_unit)) then { SETPROCESSED(_unit); - private _class = configFile >> "CfgVehicles" >> typeOf _unit; + private _class = configOf _unit; private _eventClass = _class >> "EventHandlers" >> QUOTE(XEH_CLASS); // adds ability to disable XEH completely on a unit, by manually clearing the CBA event handler class.