diff --git a/Source/Core/Controls/SectorInfoPanel.cs b/Source/Core/Controls/SectorInfoPanel.cs
index b030b34e70453324b4c82fa336f8446b35179cef..6a45b2e8a751a56ea8d1212c91c6fc656a1979a9 100644
--- a/Source/Core/Controls/SectorInfoPanel.cs
+++ b/Source/Core/Controls/SectorInfoPanel.cs
@@ -77,12 +77,12 @@ namespace CodeImp.DoomBuilder.Controls
bool showExtededCeilingInfo = false;
if(General.Map.UDMF && s.Fields != null) {
//light
- if(s.Fields.ContainsKey("lightceiling")) {
+ if(s.Fields.ContainsKey("lightceiling") || s.Fields.ContainsKey("lightceilingabsolute")) {
showExtededCeilingInfo = true;
ceilingLight.Enabled = true;
ceilingLightLabel.Enabled = true;
- int cl = (int)s.Fields["lightceiling"].Value;
+ int cl = s.Fields.GetValue("lightceiling", 0);
if(s.Fields.GetValue("lightceilingabsolute", false))
ceilingLight.Text = cl + " (abs.)";
@@ -95,12 +95,12 @@ namespace CodeImp.DoomBuilder.Controls
ceilingLightLabel.Enabled = false;
}
- if(s.Fields.ContainsKey("lightfloor")) {
+ if(s.Fields.ContainsKey("lightfloor") || s.Fields.ContainsKey("lightfloorabsolute")) {
showExtededFloorInfo = true;
floorLight.Enabled = true;
floorLightLabel.Enabled = true;
- int fl = (int)s.Fields["lightfloor"].Value;
+ int fl = s.Fields.GetValue("lightfloor", 0);
if(s.Fields.GetValue("lightfloorabsolute", false))
floorLight.Text = fl + " (abs.)";
diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
index d4884d2689f1184eb51e1c884ea0f6994e1ec47e..7c0fa20c1cfbb899002bfbc4af797e4b63cb8081 100644
--- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
+++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
@@ -36,6 +36,8 @@
System.Windows.Forms.Label label6;
System.Windows.Forms.Label label5;
this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
+ this.fadeColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
+ this.lightColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
this.brightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.desaturation = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.soundSequence = new System.Windows.Forms.TextBox();
@@ -87,8 +89,6 @@
this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
this.cancel = new System.Windows.Forms.Button();
this.apply = new System.Windows.Forms.Button();
- this.lightColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
- this.fadeColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
groupaction = new System.Windows.Forms.GroupBox();
groupeffect = new System.Windows.Forms.GroupBox();
label14 = new System.Windows.Forms.Label();
@@ -154,6 +154,26 @@
groupeffect.TabStop = false;
groupeffect.Text = " Effects:";
//
+ // fadeColor
+ //
+ this.fadeColor.DefaultValue = 0;
+ this.fadeColor.Field = "fadecolor";
+ this.fadeColor.Label = "Fade:";
+ this.fadeColor.Location = new System.Drawing.Point(223, 111);
+ this.fadeColor.Name = "fadeColor";
+ this.fadeColor.Size = new System.Drawing.Size(207, 31);
+ this.fadeColor.TabIndex = 30;
+ //
+ // lightColor
+ //
+ this.lightColor.DefaultValue = 16777215;
+ this.lightColor.Field = "lightcolor";
+ this.lightColor.Label = "Light:";
+ this.lightColor.Location = new System.Drawing.Point(223, 82);
+ this.lightColor.Name = "lightColor";
+ this.lightColor.Size = new System.Drawing.Size(207, 29);
+ this.lightColor.TabIndex = 29;
+ //
// brightness
//
this.brightness.AllowDecimal = false;
@@ -573,7 +593,7 @@
// floorBrightness
//
this.floorBrightness.AllowDecimal = false;
- this.floorBrightness.AllowNegative = false;
+ this.floorBrightness.AllowNegative = true;
this.floorBrightness.AllowRelative = true;
this.floorBrightness.ButtonStep = 16F;
this.floorBrightness.Location = new System.Drawing.Point(118, 85);
@@ -581,7 +601,7 @@
this.floorBrightness.Size = new System.Drawing.Size(62, 24);
this.floorBrightness.StepValues = null;
this.floorBrightness.TabIndex = 48;
- this.floorBrightness.Tag = "lightceiling";
+ this.floorBrightness.Tag = "lightfloor";
//
// floorRenderStyle
//
@@ -743,7 +763,7 @@
// ceilBrightness
//
this.ceilBrightness.AllowDecimal = false;
- this.ceilBrightness.AllowNegative = false;
+ this.ceilBrightness.AllowNegative = true;
this.ceilBrightness.AllowRelative = true;
this.ceilBrightness.ButtonStep = 16F;
this.ceilBrightness.Location = new System.Drawing.Point(118, 85);
@@ -855,26 +875,6 @@
this.apply.UseVisualStyleBackColor = true;
this.apply.Click += new System.EventHandler(this.apply_Click);
//
- // lightColor
- //
- this.lightColor.DefaultValue = 16777215;
- this.lightColor.Field = "lightcolor";
- this.lightColor.Label = "Light:";
- this.lightColor.Location = new System.Drawing.Point(223, 82);
- this.lightColor.Name = "lightColor";
- this.lightColor.Size = new System.Drawing.Size(207, 29);
- this.lightColor.TabIndex = 29;
- //
- // fadeColor
- //
- this.fadeColor.DefaultValue = 0;
- this.fadeColor.Field = "fadecolor";
- this.fadeColor.Label = "Fade:";
- this.fadeColor.Location = new System.Drawing.Point(223, 111);
- this.fadeColor.Name = "fadeColor";
- this.fadeColor.Size = new System.Drawing.Size(207, 31);
- this.fadeColor.TabIndex = 30;
- //
// SectorEditFormUDMF
//
this.AcceptButton = this.apply;
diff --git a/Source/Core/Windows/SectorEditFormUDMF.resx b/Source/Core/Windows/SectorEditFormUDMF.resx
index f3e8e41bc2a903f56376e6a9b958248d971e4b09..90add83371941efe06a10f7ff476635aa0b77322 100644
--- a/Source/Core/Windows/SectorEditFormUDMF.resx
+++ b/Source/Core/Windows/SectorEditFormUDMF.resx
@@ -138,6 +138,21 @@
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
+ <metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </metadata>
+ <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </metadata>
+ <metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </metadata>
+ <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </metadata>
+ <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </metadata>
<metadata name="groupfloorceiling.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>