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

Fix movedToSQF (#6124)

Browse Source
This commit is contained in:
PabstMirror
2018-02-09 14:27:21 -06:00
committed by GitHub
parent e8da3e6435
commit 9e213f0e9a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addons/common/functions/fnc_cbaSettings.sqf
View File

@ -85,17 +85,18 @@ for "_index" from 0 to (_countOptions - 1) do {
}; };
}; };
_settingsConfig = missionConfigFile >> "ACE_Settings"; private _missionSettingsConfig = missionConfigFile >> "ACE_Settings";
_countOptions = count _settingsConfig; _countOptions = count _missionSettingsConfig;
TRACE_1("Reading settings from missionConfigFile",_countOptions); TRACE_1("Reading settings from missionConfigFile",_countOptions);
for "_index" from 0 to (_countOptions - 1) do { for "_index" from 0 to (_countOptions - 1) do {
private _optionEntry = _settingsConfig select _index; private _optionEntry = _missionSettingsConfig select _index;
private _settingName = configName _optionEntry; private _settingName = configName _optionEntry;
if ((toLower _settingName) in GVAR(cbaSettings_forcedSettings)) then { if ((toLower _settingName) in GVAR(cbaSettings_forcedSettings)) then {
WARNING_1("Setting [%1] - Already Forced - ignoring missionConfig",_varName); WARNING_1("Setting [%1] - Already Forced - ignoring missionConfig",_varName);
} else { } else {
if ((isNil _settingName) && {(getNumber (_settingsConfig >> _settingName >> "movedToSQF")) == 0}) then { if ((isNil _settingName) && {(getNumber (_settingsConfig >> _settingName >> "movedToSQF")) == 0}) then {
// New setting, that was first defined in missionConfigFile // New setting, that was first defined in missionConfigFile
INFO_1("Creating new CBA setting for ace_setting from mission config [%1]",_settingName);
[_optionEntry] call FUNC(cbaSettings_loadFromConfig); [_optionEntry] call FUNC(cbaSettings_loadFromConfig);
} else { } else {
private _value = (_optionEntry >> "value") call BIS_fnc_getCfgData; private _value = (_optionEntry >> "value") call BIS_fnc_getCfgData;