stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-17 01:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sector Edit form, UDMF: sector flags were not shown properly.

Browse source 
Color picked plugin: plugin used incorrect default "lightcolor" value after r1758.
This commit is contained in:
MaxED 2013-08-10 11:42:18 +00:00
parent 6ce9043ff6
commit 4dc80538ec
2 changed files with 9 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Windows/SectorEditFormUDMF.Designer.cs generated
View file

@ -420,7 +420,7 @@
this.flags.Name = "flags";
this.flags.Size = new System.Drawing.Size(222, 121);
this.flags.TabIndex = 5;
this.flags.VerticalSpacing = 6;
this.flags.VerticalSpacing = 2;
//
// tabSurfaces
//

36
Source/Plugins/ColorPicker/Windows/SectorColorPicker.cs
View file

@ -1,34 +1,28 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Windows;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Types;
using CodeImp.DoomBuilder.VisualModes;
using CodeImp.DoomBuilder.Plugins;
namespace CodeImp.DoomBuilder.ColorPicker.Windows
{
public partial class SectorColorPicker : DelayedForm, IColorPicker
{
public ColorPickerType Type { get { return ColorPickerType.CP_SECTOR; } }
private List<Sector> selection;
private const int DEFAULT_LIGHT_COLOR = 0xFFFFFF; //ffffff
private const int DEFAULT_FADE_COLOR = 0;
private List<Sector> selection;
private List<VisualSector> visualSelection;
private int curSectorColor;
private int curFadeColor;
private int initialSectorColor;
private int initialFadeColor;
private int defaultSectorColor;
private int defaultFadeColor;
private static string currentColorTag = "lightcolor"; //lightcolor or fadecolor
private string mode;
@ -64,23 +58,9 @@ namespace CodeImp.DoomBuilder.ColorPicker.Windows
foreach (Sector s in selection)
s.Fields.BeforeFieldsChange();
//get default values
List<UniversalFieldInfo> sectorFields = General.Map.Config.SectorFields;
foreach (UniversalFieldInfo i in sectorFields) {
if (i.Name == "lightcolor")
defaultSectorColor = (int)i.Default;
else if (i.Name == "fadecolor")
defaultFadeColor = (int)i.Default;
}
//set colors
curSectorColor = selection[0].Fields.GetValue<int>("lightcolor", -1);
if (curSectorColor == -1)
curSectorColor = defaultSectorColor;
curFadeColor = selection[0].Fields.GetValue<int>("fadecolor", -1);
if (curFadeColor == -1)
curFadeColor = defaultFadeColor;
curSectorColor = selection[0].Fields.GetValue("lightcolor", DEFAULT_LIGHT_COLOR);
curFadeColor = selection[0].Fields.GetValue("fadecolor", DEFAULT_FADE_COLOR);
//check that all sectors in selection have "lightcolor" and "fadecolor" fields
for (int i = 0; i < selection.Count; i++) {
@ -123,10 +103,10 @@ namespace CodeImp.DoomBuilder.ColorPicker.Windows
private void colorPickerControl1_OnOkPressed(object sender, EventArgs e) {
//check if values are default
foreach (Sector s in selection) {
if ((int)s.Fields["lightcolor"].Value == defaultSectorColor)
if((int)s.Fields["lightcolor"].Value == DEFAULT_LIGHT_COLOR)
s.Fields.Remove("lightcolor");
if ((int)s.Fields["fadecolor"].Value == defaultFadeColor)
if ((int)s.Fields["fadecolor"].Value == DEFAULT_FADE_COLOR)
s.Fields.Remove("fadecolor");
}