Sectors mode: sector effects are now shown on top of unselected sectors (works only if "View Selection Numbering" option is enabled).

Updated documentation.

Help/gzdb/features/features.html

@@ -128,6 +128,7 @@
       </li>
       <li><span class="style1"><strong>[new]</strong></span><strong> </strong>Sector Info panel  shows the number of sector's sidedefs as well as light and fade colors (UDMF only): <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
           <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="sectors_mode/sector_info.jpg" alt="" /></div></li>
+      <li><span class="style1"><strong>[new]</strong></span> Sector effects are now shown on top of unselected sectors (works only if &quot;View Selection Numbering&quot; option is enabled).</li>
       </ul>
     </li>
       
@@ -136,7 +137,8 @@
       <li><span class="style1"><strong>[new]</strong></span> <strong>[UDMF]</strong> New actions: &quot;<strong>Align Ceiling Texture to Back Side</strong>&quot;, &quot;<strong>Align Ceiling Texture to Front Side</strong>&quot;, &quot;<strong>Align Floor Texture to Back Side</strong>&quot; and &quot;<strong>Align Floor Texture to Front Side</strong>&quot; (available in <strong>Linedefs -&gt; Align Textures</strong> menu).</li>
       <li><span class="style1"><strong>[new]</strong></span> <strong>[UDMF]</strong> &quot;<strong>Make brightness gradient</strong>&quot; command is available in Linedefs mode.</li>
       <li><strong>[UDMF]</strong> Linedef info panel: relative UDMF light values are  shown like this:   <span class="style7">16</span> (<span class="style8">128</span>), which means &quot;<span class="style7">UDMF light value</span>&quot; (&quot;<span class="style8">total surface brightness</span>&quot;). Total surface brightness is UDMF light value + sector brightness.</li>
-      </ul></li>
+      </ul>
+    </li>
     
     <li><h3><a name="things" id="things"></a>Things mode:</h3>
       <ul>

Source/Core/General/Launcher.cs

@@ -354,11 +354,11 @@ namespace CodeImp.DoomBuilder
 			
 			// Done
 			int retries = 0; //mxd
-			while (!General.Map.Graphics.Reset()) {
+			while(!General.Map.Graphics.CheckAvailability()) {
-				Thread.Sleep(10);
+				Thread.Sleep(100);
 
-				if (retries++ > 500) {
+				if (retries++ > 50) { //that's 5 seconds, right?
-					DialogResult result = General.ShowErrorMessage("Unable to reset D3D device." + Environment.NewLine + "Press Abort to quit, Retry to wait some more," + Environment.NewLine + "Ignore to proceed anyway (high chances of D3DException)", MessageBoxButtons.AbortRetryIgnore);
+					DialogResult result = General.ShowErrorMessage("Unable to reset D3D device." + Environment.NewLine + "Press Abort to quit," + Environment.NewLine + " Retry to wait some more," + Environment.NewLine + "Ignore to proceed anyway (high chances of D3DException)", MessageBoxButtons.AbortRetryIgnore);
 					if(result == DialogResult.Abort) {
 						General.Exit(true);
 					} else if (result == DialogResult.Retry) {

Source/Core/General/MapManager.cs

@@ -502,7 +502,11 @@ namespace CodeImp.DoomBuilder {
 			UpdateScriptNames();
 
 			// Center map in screen
-			if(General.Editing.Mode is ClassicMode) (General.Editing.Mode as ClassicMode).CenterInScreen();
+			if (General.Editing.Mode is ClassicMode) {
+				ClassicMode mode = General.Editing.Mode as ClassicMode;
+				mode.OnRedoEnd();
+				mode.CenterInScreen();
+			}
 
 			// Success
 			this.changed = false;
@@ -1752,6 +1756,11 @@ namespace CodeImp.DoomBuilder {
 			return io.GetType().Equals(t);
 		}
 
+		//mxd
+		public System.Drawing.SizeF GetTextSize(string text, float scale) {
+			return graphics.Font.GetTextSize(text, scale);
+		}
+
 		#endregion
 	}
 }

Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs

@@ -29,6 +29,7 @@ using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Types;
 using CodeImp.DoomBuilder.BuilderModes.Interface;
 using CodeImp.DoomBuilder.GZBuilder.Tools;
+using CodeImp.DoomBuilder.Config;
 
 #endregion
 
@@ -60,6 +61,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		// Labels
 		private Dictionary<Sector, TextLabel[]> labels;
 
+		//mxd. Effects
+		private Dictionary<int, string[]> effects;
+		
 		#endregion
 
 		#region ================== Properties
@@ -73,6 +77,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		// Constructor
 		public SectorsMode()
 		{
+			//mxd
+			effects = new Dictionary<int, string[]>();
+			foreach (SectorEffectInfo info in General.Map.Config.SortedSectorEffects) {
+				effects.Add(info.Index, new[] { info.Index + ": " + info.Title, "E"+info.Index });
+			}
 		}
 
 		// Disposer
@@ -161,6 +170,32 @@ namespace CodeImp.DoomBuilder.BuilderModes
 							if(requiredsize < s.Labels[i].radius) renderer.RenderText(l);
 						}
 					}
+
+					//mxd. Render effect labels
+					orderedselection = General.Map.Map.GetSelectedSectors(false);
+					foreach(Sector s in orderedselection) {
+						if (s.Effect != 0) {
+							TextLabel[] labelarray = labels[s];
+							for (int i = 0; i < s.Labels.Count; i++) {
+								TextLabel l = labelarray[i];
+								l.Color = General.Colors.InfoLine;
+
+								if (effects.ContainsKey(s.Effect)) {
+									float requiredsize = (General.Map.GetTextSize(effects[s.Effect][0], l.Scale).Width) / renderer.Scale;
+
+									if (requiredsize < s.Labels[i].radius) {
+										l.Text = effects[s.Effect][0];
+									} else {
+										l.Text = effects[s.Effect][1];
+									}
+								} else {
+									l.Text = "E"+s.Effect;
+								}
+
+								renderer.RenderText(l);
+							}
+						} 
+					}
 				}
 				
 				renderer.Finish();
@@ -1056,6 +1091,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		{
 			// Clear labels
 			SetupLabels();
+			base.OnRedoEnd(); //mxd
 		}
 
 		//mxd

Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs

@@ -402,7 +402,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			this.buttonselectionnumbers.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonselectionnumbers.Name = "buttonselectionnumbers";
 			this.buttonselectionnumbers.Size = new System.Drawing.Size(23, 22);
-			this.buttonselectionnumbers.Text = "View Selection Numbering";
+			this.buttonselectionnumbers.Text = "View Effects and Selection Numbering";
 			this.buttonselectionnumbers.Click += new System.EventHandler(this.buttonselectionnumbers_Click);
 			// 
 			// separatorsectors1