stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-23 12:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Linedef Edit Form, UDMF: a waring is now shown when trying to apply a non-zero action without any activation flags.

Browse source 
Program Configuration: selected test engine index was not saved when applying the form.
Program Configuration: selected test engine index was not pasted when pasting a game configuration or test engines.
Program Configuration: in some cases current test engine name was not saved when applying the form.
Program Configuration: fixed broken logic when trying to add a test engine with the same file name as already existing one.
This commit is contained in:
MaxED 2014-09-08 21:26:30 +00:00
parent 697069e27b
commit 1521f9ba20
3 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,6 +391,7 @@ namespace CodeImp.DoomBuilder.Config
this.nodebuildersave = ci.nodebuildersave;
this.nodebuildertest = ci.nodebuildertest;
this.formatinterface = ci.formatinterface; //mxd
this.currentEngineIndex = ci.currentEngineIndex; //mxd
this.resources = new DataLocationList();
this.resources.AddRange(ci.resources);
@ -472,8 +473,10 @@ namespace CodeImp.DoomBuilder.Config
//mxd
internal void PasteTestEnginesFrom(ConfigurationInfo source)
{
currentEngineIndex = source.currentEngineIndex;
testEngines = new List<EngineInfo>();
foreach(EngineInfo info in source.testEngines) testEngines.Add(new EngineInfo(info));
if(currentEngineIndex >= testEngines.Count) currentEngineIndex = testEngines.Count - 1;
changed = true;
}
@ -491,12 +494,14 @@ namespace CodeImp.DoomBuilder.Config
{
nodebuildersave = source.nodebuildersave;
nodebuildertest = source.nodebuildertest;
currentEngineIndex = source.currentEngineIndex;
resources = new DataLocationList();
resources.AddRange(source.resources);
testEngines = new List<EngineInfo>();
foreach(EngineInfo info in source.testEngines)
testEngines.Add(new EngineInfo(info)); if(currentEngineIndex >= testEngines.Count) currentEngineIndex = testEngines.Count - 1;
testEngines.Add(new EngineInfo(info));
if(currentEngineIndex >= testEngines.Count) currentEngineIndex = testEngines.Count - 1;
linedefColorPresets = new LinedefColorPreset[source.linedefColorPresets.Length];
for(int i = 0; i < source.linedefColorPresets.Length; i++)
linedefColorPresets[i] = new LinedefColorPreset(source.linedefColorPresets[i]);

26
Source/Core/Windows/ConfigForm.cs
View file

@ -309,7 +309,7 @@ namespace CodeImp.DoomBuilder.Windows
//mxd. Update engine name if needed
configinfo.TestEngines[configinfo.CurrentEngineIndex].CheckProgramName(false);
cbEngineSelector.Text = configinfo.TestProgramName;
cbEngineSelector.Items[cbEngineSelector.SelectedIndex] = configinfo.TestProgramName;
}
// Test parameters changed
@ -336,12 +336,27 @@ namespace CodeImp.DoomBuilder.Windows
testresult.Text = General.Map.Launcher.ConvertParameters(testparameters.Text, skill.Value, shortpaths.Checked);
}
}
//mxd
private void ApplyTestEngineNameChange()
{
int index = (int)cbEngineSelector.Tag;
if(index != -1 && cbEngineSelector.Text != cbEngineSelector.Items[index].ToString()) {
cbEngineSelector.Items[index] = cbEngineSelector.Text;
configinfo.TestProgramName = cbEngineSelector.Text;
configinfo.Changed = true; //mxd
}
}
// OK clicked
private void apply_Click(object sender, EventArgs e)
{
ConfigurationInfo ci;
//mxd. Apply changes of current test engine name, if there are any
//TODO: move engine selector stuff into separate component!
if(configinfo != null) ApplyTestEngineNameChange();
//mxd. Apply configuration items. They should be in the same order, riiiight?
for(int i = 0; i < listconfigs.Items.Count; i++) {
// Get configuration item
@ -389,7 +404,6 @@ namespace CodeImp.DoomBuilder.Windows
//mxd. Update engine name
configinfo.TestEngines[configinfo.CurrentEngineIndex].CheckProgramName(true);
configinfo.Changed = true;
cbEngineSelector.Text = configinfo.TestProgramName;
}
}
@ -725,13 +739,7 @@ namespace CodeImp.DoomBuilder.Windows
//mxd
private void cbEngineSelector_DropDown(object sender, EventArgs e) {
int index = (int)cbEngineSelector.Tag;
if(index != -1 && cbEngineSelector.Text != cbEngineSelector.Items[index].ToString()) {
cbEngineSelector.Items[index] = cbEngineSelector.Text;
configinfo.TestProgramName = cbEngineSelector.Text;
configinfo.Changed = true; //mxd
}
ApplyTestEngineNameChange();
}
//mxd

18
Source/Core/Windows/LinedefEditForm.cs
View file

@ -700,6 +700,24 @@ namespace CodeImp.DoomBuilder.Windows
return;
}
// Check if we have at least one activation flag when there's an action in UDMF map format (mxd)
if (General.Map.UDMF && !action.Empty)
{
bool haveactivationflag = false;
foreach (CheckBox c in udmfactivates.Checkboxes)
{
if (c.CheckState != CheckState.Unchecked)
{
haveactivationflag = true;
break;
}
}
if (!haveactivationflag &&
General.ShowWarningMessage("You are setting an action without any activation flags.\nIs that OK?", MessageBoxButtons.YesNo) == DialogResult.No)
return;
}
//mxd
bool hasAcs = !action.Empty && Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, action.Value) != -1;
int lockNum = lockNumber.GetResult(0);