From 4dc80538ec84ca37d938bc10177b7f8eed423662 Mon Sep 17 00:00:00 2001
From: MaxED <j.maxed@gmail.com>
Date: Sat, 10 Aug 2013 11:42:18 +0000
Subject: [PATCH] Sector Edit form, UDMF: sector flags were not shown properly.
Color picked plugin: plugin used incorrect default "lightcolor" value after
r1758.
---
.../Windows/SectorEditFormUDMF.Designer.cs | 2 +-
.../ColorPicker/Windows/SectorColorPicker.cs | 36 +++++--------------
2 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
index e0ae29897..f926cbff6 100644
--- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
+++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
@@ -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
//
diff --git a/Source/Plugins/ColorPicker/Windows/SectorColorPicker.cs b/Source/Plugins/ColorPicker/Windows/SectorColorPicker.cs
index af5a69198..98a10e9ad 100644
--- a/Source/Plugins/ColorPicker/Windows/SectorColorPicker.cs
+++ b/Source/Plugins/ColorPicker/Windows/SectorColorPicker.cs
@@ -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");
}
--
GitLab