Fixed, Tag Statistics window: fixed a crash when applying changes after deleting a tag label.

Fixed, Script Editor: fixed infinite loop when trying to search for empty string.
Changed, Linedefs mode: selection labels are now positioned in a less line angle obscuring way.
Changed, Draw Lines mode: text label background alpha didn't match the alpha of the labels used in other classic modes.
Updated ZDoom_ACS.cfg (SetMusicVolume).
Updated ZDoom ACC (SetMusicVolume).

Build/Compilers/ZDoom/zspecial.acs

@@ -364,6 +364,7 @@ special
 	-94:SetSectorDamage(2,5),
 	-95:SetSectorTerrain(3),
 	-96:SpawnParticle(1,15),
+	-97:SetMusicVolume(1),
 	
 	// Zandronum's
 	-100:ResetMap(0),

Build/Scripting/ZDoom_ACS.cfg

@@ -373,6 +373,7 @@ keywords
 	SetMarineWeapon = "void SetMarineWeapon(int tid, int weapon)\nSets a Scripted Marine's weapon on the fly.\nweapon: one of MARINEWEAPON_ flags";
 	SetMugShotState = "void SetMugShotState(str state)\nSets the state of the mug shot in SBARINFO status bars.\nThe state you set will only be interrupted by damage or if the player\npicks up a weapon, provided the mugshot supports it.";
 	SetMusic = "void SetMusic(str song[, int order[, int unused]])";
+	SetMusicVolume = "void SetMusicVolume(float volume)";
 	SetPlayerProperty = "SetPlayerProperty(who, set, which)";
 	SetPointer = "bool SetPointer(int assign_slot, int tid[, int pointer_selector[, int flags]])\nSet the value of one of the caller's stored pointers.";
 	SetResultValue = "void SetResultValue(int value)";

Source/Core/GZBuilder/Windows/TagStatisticsForm.cs

@@ -203,7 +203,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Windows
 
 		private void apply_Click(object sender, EventArgs e) 
 		{
-			//refill TagLabels with table data
+			// Refill TagLabels with table data
 			dataGridView.Sort(TagColumn, ListSortDirection.Ascending);
 			General.Map.Options.TagLabels.Clear();
 

Source/Core/Rendering/TextLabel.cs

@@ -53,6 +53,7 @@ namespace CodeImp.DoomBuilder.Rendering
 		private TextAlignmentX alignx;
 		private TextAlignmentY aligny;
 		private SizeF textsize;
+		private Size texturesize;
 		private bool drawbg; //mxd
 		
 		// This keeps track if changes were made
@@ -199,8 +200,8 @@ namespace CodeImp.DoomBuilder.Rendering
 						}
 
 						// Create label image
-						Bitmap img = CreateLabelImage(text, font, alignx, aligny, color, backcolor, drawbg);
-						textsize = img.Size;
+						Bitmap img = CreateLabelImage(text, font, alignx, aligny, color, backcolor, drawbg, out textsize);
+						texturesize = img.Size;
 
 						// Create texture
 						MemoryStream memstream = new MemoryStream((img.Size.Width * img.Size.Height * 4) + 4096);
@@ -217,8 +218,8 @@ namespace CodeImp.DoomBuilder.Rendering
 					switch(alignx)
 					{
 						case TextAlignmentX.Left: beginx = absview.X; break;
-						case TextAlignmentX.Center: beginx = absview.X + (absview.Width - textsize.Width) * 0.5f; break;
-						case TextAlignmentX.Right: beginx = absview.X + absview.Width - textsize.Width; break;
+						case TextAlignmentX.Center: beginx = absview.X + (absview.Width - texturesize.Width) * 0.5f; break;
+						case TextAlignmentX.Right: beginx = absview.X + absview.Width - texturesize.Width; break;
 					}
 
 					// Align the text vertically
@@ -226,8 +227,8 @@ namespace CodeImp.DoomBuilder.Rendering
 					switch(aligny)
 					{
 						case TextAlignmentY.Top: beginy = absview.Y; break;
-						case TextAlignmentY.Middle: beginy = absview.Y + (absview.Height - textsize.Height) * 0.5f; break;
-						case TextAlignmentY.Bottom: beginy = absview.Y + absview.Height - textsize.Height; break;
+						case TextAlignmentY.Middle: beginy = absview.Y + (absview.Height - texturesize.Height) * 0.5f; break;
+						case TextAlignmentY.Bottom: beginy = absview.Y + absview.Height - texturesize.Height; break;
 					}
 
 					//mxd. Create the buffer
@@ -240,7 +241,7 @@ namespace CodeImp.DoomBuilder.Rendering
 					//mxd. Lock the buffer
 					using(DataStream stream = textbuffer.Lock(0, 4 * FlatVertex.Stride, LockFlags.Discard | LockFlags.NoSystemLock))
 					{
-						FlatQuad quad = new FlatQuad(PrimitiveType.TriangleStrip, beginx, beginy, beginx + textsize.Width, beginy + textsize.Height);
+						FlatQuad quad = new FlatQuad(PrimitiveType.TriangleStrip, beginx, beginy, beginx + texturesize.Width, beginy + texturesize.Height);
 						stream.WriteRange(quad.Vertices);
 					}
 
@@ -261,7 +262,7 @@ namespace CodeImp.DoomBuilder.Rendering
 		}
 
 		//mxd
-		private static Bitmap CreateLabelImage(string text, Font font, TextAlignmentX alignx, TextAlignmentY aligny, PixelColor color, PixelColor backcolor, bool drawbg)
+		private static Bitmap CreateLabelImage(string text, Font font, TextAlignmentX alignx, TextAlignmentY aligny, PixelColor color, PixelColor backcolor, bool drawbg, out SizeF textsize)
 		{
 			PointF textorigin = new PointF(4, 3);
 			RectangleF textrect = new RectangleF(textorigin, General.Interface.MeasureString(text, font));
@@ -269,6 +270,9 @@ namespace CodeImp.DoomBuilder.Rendering
 			textrect.Height = (float)Math.Round(textrect.Height);
 			RectangleF bgrect = new RectangleF(0, 0, textrect.Width + textorigin.X * 2, textrect.Height + textorigin.Y * 2);
 
+			// Store calculated text size...
+			textsize = new SizeF(bgrect.Width, bgrect.Height);
+
 			// Make PO2 image, for speed and giggles...
 			RectangleF po2rect = new RectangleF(0, 0, General.NextPowerOf2((int)bgrect.Width), General.NextPowerOf2((int)bgrect.Height));
 

Source/Plugins/BuilderModes/BuilderModes.csproj

@@ -411,6 +411,7 @@
     <Compile Include="FindReplace\FindVertexNumber.cs" />
     <Compile Include="General\HintLabel.cs" />
     <Compile Include="General\BuilderModesTools.cs" />
+    <Compile Include="General\SelectionLabel.cs" />
     <Compile Include="General\UndoGroup.cs" />
     <Compile Include="Interface\BridgeModeForm.cs">
       <SubType>Form</SubType>

Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs

@@ -62,7 +62,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		private Vector2D insertpreview = new Vector2D(float.NaN, float.NaN); //mxd
 
 		//mxd. Text labels
-		private Dictionary<Linedef, TextLabel> labels;
+		private Dictionary<Linedef, SelectionLabel> labels;
 		private Dictionary<Sector, TextLabel[]> sectorlabels;
 		private Dictionary<Sector, string[]> sectortexts;
 		
@@ -92,7 +92,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			if(!isdisposed)
 			{
 				// Dispose old labels
-				if(labels != null) foreach(TextLabel l in labels.Values) l.Dispose();
+				if(labels != null) foreach(SelectionLabel l in labels.Values) l.Dispose();
 				if(sectorlabels != null)
 				{
 					foreach(TextLabel[] lbl in sectorlabels.Values)
@@ -499,11 +499,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			base.UpdateSelectionInfo();
 			
 			// Dispose old labels
-			if(labels != null) foreach(TextLabel l in labels.Values) l.Dispose();
+			if(labels != null) foreach(SelectionLabel l in labels.Values) l.Dispose();
 
 			// Make text labels for selected linedefs
 			ICollection<Linedef> orderedselection = General.Map.Map.GetSelectedLinedefs(true);
-			labels = new Dictionary<Linedef, TextLabel>(orderedselection.Count);
+			labels = new Dictionary<Linedef, SelectionLabel>(orderedselection.Count);
 
 			// Otherwise significant delays will occure.
 			// Also we probably won't care about selection ordering when selecting this many anyway
@@ -512,15 +512,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			int index = 0;
 			foreach(Linedef linedef in orderedselection)
 			{
-				Vector2D v = linedef.GetCenterPoint();
-				TextLabel l = new TextLabel();
-				l.TransformCoords = true;
-				l.Rectangle = new RectangleF(v.x, v.y, 0.0f, 0.0f);
-				l.AlignX = TextAlignmentX.Center;
-				l.AlignY = TextAlignmentY.Middle;
+				SelectionLabel l = new SelectionLabel();
+				l.OffsetPosition = true;
 				l.Color = (linedef == highlighted ? General.Colors.Selection : General.Colors.Highlight);
 				l.BackColor = General.Colors.Background.WithAlpha(192);
-				l.Text = (++index).ToString();
+				l.TextLabel.Text = (++index).ToString();
 				labels.Add(linedef, l);
 			}
 		}
@@ -728,11 +724,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				if(BuilderPlug.Me.ViewSelectionNumbers)
 				{
 					List<TextLabel> torender = new List<TextLabel>(labels.Count);
-					foreach(KeyValuePair<Linedef, TextLabel> group in labels)
+					foreach(KeyValuePair<Linedef, SelectionLabel> group in labels)
 					{
 						// Render only when enough space for the label to see
+						group.Value.Move(group.Key.Start.Position, group.Key.End.Position);
 						float requiredsize = (group.Value.TextSize.Width) / renderer.Scale;
-						if(group.Key.Length > requiredsize) torender.Add(group.Value);
+						if(group.Key.Length > requiredsize)
+						{
+							torender.Add(group.Value.TextLabel);
+						}
 					}
 
 					renderer.RenderText(torender);
@@ -1393,7 +1393,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
 
 			//mxd. Clear selection labels
-			foreach(TextLabel l in labels.Values) l.Dispose();
+			foreach(SelectionLabel l in labels.Values) l.Dispose();
 			labels.Clear();
 
 			// Redraw

Source/Plugins/BuilderModes/General/LineLengthLabel.cs

@@ -52,7 +52,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		//mxd. Display options
 		public bool ShowAngle { get { return showangle; } set { showangle = value; UpdateText(); } }
 		public bool OffsetPosition { get { return offsetposition; } set { offsetposition = value; Move(start, end); } }
-		public PixelColor TextColor { get { return label.Color; } set { label.Color = value; } }
+		public PixelColor Color { get { return label.Color; } set { label.Color = value; } }
+		public PixelColor BackColor { get { return label.BackColor; } set { label.BackColor = value; } }
+		public SizeF TextSize { get { return label.TextSize; } }
 
 		#endregion
 
@@ -108,7 +110,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 						AlignX = TextAlignmentX.Center, 
 						AlignY = TextAlignmentY.Middle, 
 						Color = General.Colors.Highlight, 
-						BackColor = General.Colors.Background.WithAlpha(64), 
+						BackColor = General.Colors.Background.WithAlpha(128), 
 						TransformCoords = true,
 					};
 		}

Source/Plugins/BuilderModes/General/SelectionLabel.cs

@@ -0,0 +1,11 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class SelectionLabel : LineLengthLabel
+	{
+		// Constructor
+		public SelectionLabel() : base(false, true) { }
+		
+		// We don't want any changes here
+		protected override void UpdateText() { }
+	}
+}