Fix movedToSQF (#6124)

This commit is contained in:
PabstMirror 2018-02-09 14:27:21 -06:00 committed by GitHub
parent e8da3e6435
commit 9e213f0e9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -85,17 +85,18 @@ for "_index" from 0 to (_countOptions - 1) do {
};
};
_settingsConfig = missionConfigFile >> "ACE_Settings";
_countOptions = count _settingsConfig;
private _missionSettingsConfig = missionConfigFile >> "ACE_Settings";
_countOptions = count _missionSettingsConfig;
TRACE_1("Reading settings from missionConfigFile",_countOptions);
for "_index" from 0 to (_countOptions - 1) do {
private _optionEntry = _settingsConfig select _index;
private _optionEntry = _missionSettingsConfig select _index;
private _settingName = configName _optionEntry;
if ((toLower _settingName) in GVAR(cbaSettings_forcedSettings)) then {
WARNING_1("Setting [%1] - Already Forced - ignoring missionConfig",_varName);
} else {
if ((isNil _settingName) && {(getNumber (_settingsConfig >> _settingName >> "movedToSQF")) == 0}) then {
// 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);
} else {
private _value = (_optionEntry >> "value") call BIS_fnc_getCfgData;