Exclude uniforms with inherited modelSides (#4720)

This commit is contained in:
jonpas 2016-12-12 19:36:53 +01:00 committed by Glowbal
parent 8afc4083d0
commit 1ecd674ac6
7 changed files with 40 additions and 1434 deletions

View File

@ -2,6 +2,8 @@
ADDON = false; ADDON = false;
PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END;
ADDON = true; ADDON = true;

View File

@ -2,6 +2,8 @@
ADDON = false; ADDON = false;
PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END;
ADDON = true; ADDON = true;

View File

@ -4,7 +4,6 @@
// #define DEBUG_MODE_FULL // #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE // #define DISABLE_COMPILE_CACHE
// #define CBA_DEBUG_SYNCHRONOUS
// #define ENABLE_PERFORMANCE_COUNTERS // #define ENABLE_PERFORMANCE_COUNTERS
#ifdef DEBUG_ENABLED_NOCROSSHAIR #ifdef DEBUG_ENABLED_NOCROSSHAIR

File diff suppressed because it is too large Load Diff

View File

@ -2,6 +2,8 @@
ADDON = false; ADDON = false;
PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END;
ADDON = true; ADDON = true;

View File

@ -1,23 +1,24 @@
/* /*
* Author: BaerMitUmlaut, 654wak654 * Author: BaerMitUmlaut, 654wak654
* Generates the CfgVehicles.hpp to unlock all uniforms. * Generates the CfgVehicles config to allow uniform usage on all sides.
* *
* Arguments: * Arguments:
* None * None
* *
* Return Value: * Return Value:
* CfgVehicles.hpp content <STRING> * CfgVehicles Content <STRING>
* *
* Example: * Example:
* [] call ace_nouniformrestrictions_fnc_exportConfig * [] call ace_nouniformrestrictions_fnc_exportConfig
* *
* Public: [Yes] * Public: Yes
*/ */
#include "script_component.hpp" #include "script_component.hpp"
private _modifyClasses = []; private _modifyClasses = [];
private _baseClasses = []; private _baseClasses = [];
{ {
if ((_x >> "modelSides") in (configProperties [_x, "true", false])) then {
private _modifyClass = { private _modifyClass = {
if (!isNull (_x >> "modelSides")) exitWith {_x}; if (!isNull (_x >> "modelSides")) exitWith {_x};
} forEach (configHierarchy _x); } forEach (configHierarchy _x);
@ -26,6 +27,7 @@ private _baseClasses = [];
if !(_baseClass in (_modifyClasses apply {_x select 0})) then { if !(_baseClass in (_modifyClasses apply {_x select 0})) then {
_baseClasses pushBackUnique _baseClass; _baseClasses pushBackUnique _baseClass;
}; };
};
false false
} count ( } count (
("!isNull (_x >> 'modelSides') &&" + ("!isNull (_x >> 'modelSides') &&" +

View File

@ -4,15 +4,14 @@
// #define DEBUG_MODE_FULL // #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE // #define DISABLE_COMPILE_CACHE
// #define CBA_DEBUG_SYNCHRONOUS
// #define ENABLE_PERFORMANCE_COUNTERS // #define ENABLE_PERFORMANCE_COUNTERS
#ifdef DEBUG_ENABLED_UNIFORMS #ifdef DEBUG_ENABLED_NOUNIFORMRESTRICTIONS
#define DEBUG_MODE_FULL #define DEBUG_MODE_FULL
#endif #endif
#ifdef DEBUG_SETTINGS_UNIFORMS #ifdef DEBUG_SETTINGS_NOUNIFORMRESTRICTIONS
#define DEBUG_SETTINGS DEBUG_SETTINGS_UNIFORMS #define DEBUG_SETTINGS DEBUG_SETTINGS_NOUNIFORMRESTRICTIONS
#endif #endif
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"