Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

configClasses fixes thanks to @ravmustang

Browse Source
This commit is contained in:
vbawol 2017-08-26 07:12:50 -05:00
parent fa3577473e
commit 30d8107d75
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_code/compile/setup/masterLoop/init.sqf
View File

@ -84,7 +84,7 @@ _masterConfig = 'CfgBuildingLootPos' call EPOCH_returnConfig;
_lootClasses = [];
_lootClassesIgnore = ['Default'];
'_cN = configName _x;if !(_cN in _lootClassesIgnore)then{_lootClasses pushBackUnique _cN};' configClasses _masterConfig;
'_cN = configName _x;if !(_cN in _lootClassesIgnore)then{_lootClasses pushBackUnique _cN}; true' configClasses _masterConfig;
_lootBubble = {
private["_jammer", "_others", "_objects", "_nearObjects", "_building", "_lootDist", "_lootLoc", "_playerPos", "_distanceTraveled"];

5
Sources/epoch_server/init/server_securityfunctions.sqf
View File

@ -534,8 +534,7 @@ _sknBanANDSleepQuick = _skn_AH_Ban+"; uiSleep 1";
// CfgPatches Check
_sknPatches = [];
_configs = "true" configClasses (configFile >> "CfgPatches");
{_sknPatches pushBack (configName _x)}forEach _configs;
"_sknPatches pushBack (configName _x); true" configClasses (configFile >> "CfgPatches");
{_sknPatches pushBackUnique _x}forEach _skn_whitelist_cfgPatches;
_skn_addonCheckCode = if (_skn_check_addons) then {"[] spawn{_config = '!(configName _x in "+str _sknPatches+")' configClasses (configFile >> 'CfgPatches');if !(_config isEqualTo []) then {[format['Disallowed Addon %1',_config],["+str (_skn_cfgPatchesCfg select 0)+",0]] call "+_skn_AH_Ban+"}};"} else {""};
_skn_fileCheckCode = if (_skn_check_files isEqualTo []) then {""} else {"{if (str(compile preprocessFileLineNumbers (_x select 0)) != str(missionNamespace getVariable [_x select 1,'']))exitWith{[format['Modified File %1 (%2/%3)',_x select 1,count toArray str (compile preprocessFileLineNumbers (_x select 0)),count toArray str(missionNamespace getVariable [_x select 1,''])],0] call "+_skn_AH_Ban+"}} forEach "+str _skn_check_files+";"};
@ -1476,7 +1475,7 @@ _skn_admincode = compileFinal ("
_masterConfig = 'CfgBuildingLootPos' call EPOCH_returnConfig;
_lootClasses = [];
_lootClassesIgnore = ['Default'];
'_cN = configName _x;if !(_cN in _lootClassesIgnore)then{_lootClasses pushBack _cN};' configClasses _masterConfig;
'_cN = configName _x;if !(_cN in _lootClassesIgnore)then{_lootClasses pushBack _cN}; true' configClasses _masterConfig;
_cntBuildings = 0;
{
if (_x call EPOCH_spawnLoot) then {

2
Tools/SQF/getCfgPatches.sqf
View File

File diff suppressed because one or more lines are too long

2
Tools/SQF/saveLootPositionsVector.sqf
View File

@ -440,7 +440,7 @@ EPOCH_KeyDownCustom = {
if (_ctrl) then {
EPB = []; "if (isclass _x) then {EPB pushBack (configName _x); true}" configClasses (getMissionConfig "CfgBuildingLootPos")
EPB = []; "if (isclass _x) then {EPB pushBack (configName _x)}; true" configClasses (getMissionConfig "CfgBuildingLootPos")
} else {
_buildLoading = objNull;