Merge pull request #4782 from Dystopian/simplify_class_crawling

Simplify config crawling in nouniformrestrictions
This commit is contained in:
jonpas 2016-12-29 18:31:50 +01:00 committed by GitHub
commit e94ca3fab9

View File

@ -18,19 +18,15 @@
private _modifyClasses = []; private _modifyClasses = [];
private _baseClasses = []; private _baseClasses = [];
{ {
if ((_x >> "modelSides") in (configProperties [_x, "true", false])) then { private _baseClass = inheritsFrom _x;
private _modifyClass = { _modifyClasses pushBackUnique [_x, _baseClass];
if (!isNull (_x >> "modelSides")) exitWith {_x}; if !(_baseClass in (_modifyClasses apply {_x select 0})) then {
} forEach (configHierarchy _x); _baseClasses pushBackUnique _baseClass;
private _baseClass = inheritsFrom _modifyClass;
_modifyClasses pushBackUnique [_modifyClass, _baseClass];
if !(_baseClass in (_modifyClasses apply {_x select 0})) then {
_baseClasses pushBackUnique _baseClass;
};
}; };
false false
} count ( } count (
("!isNull (_x >> 'modelSides') &&" + ("!isNull (_x >> 'modelSides') &&" +
"{(_x >> 'modelSides') in (configProperties [_x, 'true', false])} &&" +
"{!(getArray (_x >> 'modelSides') isEqualTo [6])} &&" + "{!(getArray (_x >> 'modelSides') isEqualTo [6])} &&" +
"{!(getArray (_x >> 'modelSides') isEqualTo [0,1,2,3])}") "{!(getArray (_x >> 'modelSides') isEqualTo [0,1,2,3])}")
configClasses (configFile >> "CfgVehicles") configClasses (configFile >> "CfgVehicles")