mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Exclude uniforms with inherited modelSides (#4720)
This commit is contained in:
parent
8afc4083d0
commit
1ecd674ac6
@ -2,6 +2,8 @@
|
||||
|
||||
ADDON = false;
|
||||
|
||||
PREP_RECOMPILE_START;
|
||||
#include "XEH_PREP.hpp"
|
||||
PREP_RECOMPILE_END;
|
||||
|
||||
ADDON = true;
|
||||
|
@ -2,6 +2,8 @@
|
||||
|
||||
ADDON = false;
|
||||
|
||||
PREP_RECOMPILE_START;
|
||||
#include "XEH_PREP.hpp"
|
||||
PREP_RECOMPILE_END;
|
||||
|
||||
ADDON = true;
|
||||
|
@ -4,7 +4,6 @@
|
||||
|
||||
// #define DEBUG_MODE_FULL
|
||||
// #define DISABLE_COMPILE_CACHE
|
||||
// #define CBA_DEBUG_SYNCHRONOUS
|
||||
// #define ENABLE_PERFORMANCE_COUNTERS
|
||||
|
||||
#ifdef DEBUG_ENABLED_NOCROSSHAIR
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -2,6 +2,8 @@
|
||||
|
||||
ADDON = false;
|
||||
|
||||
PREP_RECOMPILE_START;
|
||||
#include "XEH_PREP.hpp"
|
||||
PREP_RECOMPILE_END;
|
||||
|
||||
ADDON = true;
|
||||
|
@ -1,30 +1,32 @@
|
||||
/*
|
||||
* Author: BaerMitUmlaut, 654wak654
|
||||
* Generates the CfgVehicles.hpp to unlock all uniforms.
|
||||
* Generates the CfgVehicles config to allow uniform usage on all sides.
|
||||
*
|
||||
* Arguments:
|
||||
* None
|
||||
*
|
||||
* Return Value:
|
||||
* CfgVehicles.hpp content <STRING>
|
||||
* CfgVehicles Content <STRING>
|
||||
*
|
||||
* Example:
|
||||
* [] call ace_nouniformrestrictions_fnc_exportConfig
|
||||
*
|
||||
* Public: [Yes]
|
||||
* Public: Yes
|
||||
*/
|
||||
#include "script_component.hpp"
|
||||
|
||||
private _modifyClasses = [];
|
||||
private _baseClasses = [];
|
||||
{
|
||||
private _modifyClass = {
|
||||
if (!isNull (_x >> "modelSides")) exitWith {_x};
|
||||
} forEach (configHierarchy _x);
|
||||
private _baseClass = inheritsFrom _modifyClass;
|
||||
_modifyClasses pushBackUnique [_modifyClass, _baseClass];
|
||||
if !(_baseClass in (_modifyClasses apply {_x select 0})) then {
|
||||
_baseClasses pushBackUnique _baseClass;
|
||||
if ((_x >> "modelSides") in (configProperties [_x, "true", false])) then {
|
||||
private _modifyClass = {
|
||||
if (!isNull (_x >> "modelSides")) exitWith {_x};
|
||||
} forEach (configHierarchy _x);
|
||||
private _baseClass = inheritsFrom _modifyClass;
|
||||
_modifyClasses pushBackUnique [_modifyClass, _baseClass];
|
||||
if !(_baseClass in (_modifyClasses apply {_x select 0})) then {
|
||||
_baseClasses pushBackUnique _baseClass;
|
||||
};
|
||||
};
|
||||
false
|
||||
} count (
|
||||
|
@ -4,15 +4,14 @@
|
||||
|
||||
// #define DEBUG_MODE_FULL
|
||||
// #define DISABLE_COMPILE_CACHE
|
||||
// #define CBA_DEBUG_SYNCHRONOUS
|
||||
// #define ENABLE_PERFORMANCE_COUNTERS
|
||||
|
||||
#ifdef DEBUG_ENABLED_UNIFORMS
|
||||
#ifdef DEBUG_ENABLED_NOUNIFORMRESTRICTIONS
|
||||
#define DEBUG_MODE_FULL
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_SETTINGS_UNIFORMS
|
||||
#define DEBUG_SETTINGS DEBUG_SETTINGS_UNIFORMS
|
||||
#ifdef DEBUG_SETTINGS_NOUNIFORMRESTRICTIONS
|
||||
#define DEBUG_SETTINGS DEBUG_SETTINGS_NOUNIFORMRESTRICTIONS
|
||||
#endif
|
||||
|
||||
#include "\z\ace\addons\main\script_macros.hpp"
|
||||
|
Loading…
Reference in New Issue
Block a user