stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-30 07:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some game configuration settings were not removed from GZBuilder.cfg after removing them in the Game Configurations form (namely, deletion of texture sets, test engines or linedef color presets was not actually removing them from the config file).

Browse source
This commit is contained in:
MaxED 2014-08-05 14:27:26 +00:00
parent bed613694d
commit 7916cb6bbb
1 changed files with 55 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
Source/Core/Config/ConfigurationInfo.cs
View file

@ -253,26 +253,10 @@ namespace CodeImp.DoomBuilder.Config
//mxd. Test Engines //mxd. Test Engines
General.Settings.WriteSetting("configurations." + settingskey + ".currentengineindex", currentEngineIndex); General.Settings.WriteSetting("configurations." + settingskey + ".currentengineindex", currentEngineIndex);
for (int i = 0; i < testEngines.Count; i++ ) { SaveTestEngines();
string path = "configurations." + settingskey + ".engines.engine" + i.ToString(CultureInfo.InvariantCulture);
General.Settings.WriteSetting(path + ".testprogramname", testEngines[i].TestProgramName);
General.Settings.WriteSetting(path + ".testprogram", testEngines[i].TestProgram);
General.Settings.WriteSetting(path + ".testparameters", testEngines[i].TestParameters);
General.Settings.WriteSetting(path + ".testshortpaths", testEngines[i].TestShortPaths);
General.Settings.WriteSetting(path + ".customparameters", testEngines[i].CustomParameters);
General.Settings.WriteSetting(path + ".testskill", testEngines[i].TestSkill);
}
//mxd. Custom linedef colors //mxd. Custom linedef colors
for(int i = 0; i < linedefColorPresets.Length; i++) { SaveLinedefColorPresets();
string path = "configurations." + settingskey + ".linedefcolorpresets.preset" + i.ToString(CultureInfo.InvariantCulture);
General.Settings.WriteSetting(path + ".name", linedefColorPresets[i].Name);
General.Settings.WriteSetting(path + ".color", linedefColorPresets[i].Color.ToInt());
General.Settings.WriteSetting(path + ".action", linedefColorPresets[i].Action);
General.Settings.WriteSetting(path + ".activation", linedefColorPresets[i].Activation);
General.Settings.WriteSetting(path + ".flags", string.Join(LINEDEF_COLOR_PRESET_FLAGS_SEPARATOR[0], linedefColorPresets[i].Flags.ToArray()));
General.Settings.WriteSetting(path + ".restrictedflags", string.Join(LINEDEF_COLOR_PRESET_FLAGS_SEPARATOR[0], linedefColorPresets[i].RestrictedFlags.ToArray()));
}
General.Settings.WriteSetting("configurations." + settingskey + ".startmode", startmode); General.Settings.WriteSetting("configurations." + settingskey + ".startmode", startmode);
resources.WriteToConfig(General.Settings.Config, "configurations." + settingskey + ".resources"); resources.WriteToConfig(General.Settings.Config, "configurations." + settingskey + ".resources");
@ -286,13 +270,14 @@ namespace CodeImp.DoomBuilder.Config
} }
// Write texturesets to configuration // Write texturesets to configuration
General.Settings.DeleteSetting("configurations." + settingskey + ".texturesets"); //mxd
for(int i = 0; i < texturesets.Count; i++) for(int i = 0; i < texturesets.Count; i++)
{ {
texturesets[i].WriteToConfig(General.Settings.Config, texturesets[i].WriteToConfig(General.Settings.Config,
"configurations." + settingskey + ".texturesets.set" + i.ToString(CultureInfo.InvariantCulture)); "configurations." + settingskey + ".texturesets.set" + i.ToString(CultureInfo.InvariantCulture));
} }
// Write filters to configuration // Write edit modes to configuration
ListDictionary modeslist = new ListDictionary(); ListDictionary modeslist = new ListDictionary();
int index = 0; int index = 0;
foreach(KeyValuePair<string, bool> em in editmodes) foreach(KeyValuePair<string, bool> em in editmodes)
@ -307,6 +292,57 @@ namespace CodeImp.DoomBuilder.Config
General.Settings.WriteSetting("configurations." + settingskey + ".editmodes", modeslist); General.Settings.WriteSetting("configurations." + settingskey + ".editmodes", modeslist);
} }
//mxd
private void SaveTestEngines()
{
IDictionary resinfo, rlinfo;
// Fill structure
resinfo = new ListDictionary();
for(int i = 0; i < testEngines.Count; i++) {
rlinfo = new ListDictionary();
rlinfo.Add("testprogramname", testEngines[i].TestProgramName);
rlinfo.Add("testprogram", testEngines[i].TestProgram);
rlinfo.Add("testparameters", testEngines[i].TestParameters);
rlinfo.Add("testshortpaths", testEngines[i].TestShortPaths);
rlinfo.Add("customparameters", testEngines[i].CustomParameters);
rlinfo.Add("testskill", testEngines[i].TestSkill);
// Add structure
resinfo.Add("engine" + i.ToString(CultureInfo.InvariantCulture), rlinfo);
}
// Write to config
General.Settings.Config.WriteSetting("configurations." + settingskey + ".engines", resinfo);
}
//mxd
private void SaveLinedefColorPresets()
{
IDictionary resinfo, rlinfo;
// Fill structure
resinfo = new ListDictionary();
for(int i = 0; i < linedefColorPresets.Length; i++) {
rlinfo = new ListDictionary();
rlinfo.Add("name", linedefColorPresets[i].Name);
rlinfo.Add("color", linedefColorPresets[i].Color.ToInt());
rlinfo.Add("action", linedefColorPresets[i].Action);
rlinfo.Add("activation", linedefColorPresets[i].Activation);
rlinfo.Add("flags", string.Join(LINEDEF_COLOR_PRESET_FLAGS_SEPARATOR[0], linedefColorPresets[i].Flags.ToArray()));
rlinfo.Add("restrictedflags", string.Join(LINEDEF_COLOR_PRESET_FLAGS_SEPARATOR[0], linedefColorPresets[i].RestrictedFlags.ToArray()));
// Add structure
resinfo.Add("preset" + i.ToString(CultureInfo.InvariantCulture), rlinfo);
}
// Write to config
General.Settings.Config.WriteSetting("configurations." + settingskey + ".linedefcolorpresets", resinfo);
}
// String representation // String representation
public override string ToString() public override string ToString()
{ {