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

Fixed, Linedef Color Presets window: Linedef Actions and Linedef Activations lists were accidentally modified during window initialization.

Browse source
This commit is contained in:
MaxED 2015-11-16 08:14:35 +00:00
parent f452fca58c
commit e62da4e6b2
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Source/Core/Windows/LinedefColorPresetsForm.cs
View file

@ -74,7 +74,7 @@ namespace CodeImp.DoomBuilder.Windows
// Setup preset controls // Setup preset controls
// Add flags // Add flags
foreach (KeyValuePair<string, string> lf in General.Map.Config.LinedefFlags) foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefFlags)
{ {
CheckBox box = flags.Add(lf.Value, lf.Key); CheckBox box = flags.Add(lf.Value, lf.Key);
box.ThreeState = true; box.ThreeState = true;
@ -84,9 +84,8 @@ namespace CodeImp.DoomBuilder.Windows
// Fill actions list // Fill actions list
action.GeneralizedCategories = General.Map.Config.GenActionCategories; action.GeneralizedCategories = General.Map.Config.GenActionCategories;
LinedefActionInfo anyAction = new LinedefActionInfo(-1, "Any action", true, false); List<LinedefActionInfo> infos = new List<LinedefActionInfo> { new LinedefActionInfo(-1, "Any action", true, false) };
List<LinedefActionInfo> infos = General.Map.Config.SortedLinedefActions; infos.AddRange(General.Map.Config.SortedLinedefActions);
infos.Insert(0, anyAction);
action.AddInfo(infos.ToArray()); action.AddInfo(infos.ToArray());
action.Value = -1; action.Value = -1;
@ -96,7 +95,7 @@ namespace CodeImp.DoomBuilder.Windows
activation.Visible = !General.Map.UDMF; activation.Visible = !General.Map.UDMF;
//get activates //get activates
List<LinedefActivateInfo> activations = General.Map.Config.LinedefActivates; List<LinedefActivateInfo> activations = new List<LinedefActivateInfo>(General.Map.Config.LinedefActivates);
if(activations.Count > 0) if(activations.Count > 0)
{ {
@ -104,7 +103,7 @@ namespace CodeImp.DoomBuilder.Windows
if(General.Map.UDMF) if(General.Map.UDMF)
{ {
foreach (LinedefActivateInfo ai in General.Map.Config.LinedefActivates) foreach(LinedefActivateInfo ai in General.Map.Config.LinedefActivates)
{ {
CheckBox box = udmfactivates.Add(ai.Title, ai.Key); CheckBox box = udmfactivates.Add(ai.Title, ai.Key);
box.ThreeState = true; box.ThreeState = true;
@ -159,12 +158,12 @@ namespace CodeImp.DoomBuilder.Windows
if(other.Preset.Flags.Count != item.Preset.Flags.Count) continue; if(other.Preset.Flags.Count != item.Preset.Flags.Count) continue;
if(other.Preset.RestrictedFlags.Count != item.Preset.RestrictedFlags.Count) continue; if(other.Preset.RestrictedFlags.Count != item.Preset.RestrictedFlags.Count) continue;
bool gotMismatch = false; bool gotmismatch = false;
foreach(string flag in other.Preset.Flags) foreach(string flag in other.Preset.Flags)
{ {
if(!item.Preset.Flags.Contains(flag)) if(!item.Preset.Flags.Contains(flag))
{ {
gotMismatch = true; gotmismatch = true;
break; break;
} }
} }
@ -173,12 +172,12 @@ namespace CodeImp.DoomBuilder.Windows
{ {
if(!item.Preset.RestrictedFlags.Contains(flag)) if(!item.Preset.RestrictedFlags.Contains(flag))
{ {
gotMismatch = true; gotmismatch = true;
break; break;
} }
} }
if(gotMismatch) continue; if(gotmismatch) continue;
//we have a match //we have a match
warning = "Preset matches '" + other.Preset.Name + "'!"; warning = "Preset matches '" + other.Preset.Name + "'!";
@ -225,7 +224,7 @@ namespace CodeImp.DoomBuilder.Windows
} }
else else
{ {
foreach (CheckBox box in source.Checkboxes) foreach(CheckBox box in source.Checkboxes)
{ {
string flag = box.Tag.ToString(); string flag = box.Tag.ToString();
if(preset.Flags.Contains(flag)) preset.Flags.Remove(flag); if(preset.Flags.Contains(flag)) preset.Flags.Remove(flag);