Merge remote-tracking branch 'udb/master'

Build/Configurations/Includes/SRB222_common.cfg

@@ -107,6 +107,9 @@ mapformat_udmf
 	// Enables support for plane equation slopes
 	planeequationsupport = true;
 
+	// Enables support for vertex heights
+	vertexheightsupport = true;
+
 	// Enables setting distinct brightness for floor, ceiling, and walls
 	distinctfloorandceilingbrightness = true;
 	distinctwallbrightness = false;

Build/Configurations/Includes/ZDoom_common.cfg

@@ -363,6 +363,9 @@ mapformat_udmf
 	
 	// Enables support for plane equation slopes
 	planeequationsupport = true;
+
+	// Enables support for vertex heights
+	vertexheightsupport = true;
 	
 	// Enables setting brightness for floor, ceiling, and walls independently from each other
 	distinctfloorandceilingbrightness = true;

Source/Core/Config/GameConfiguration.cs

@@ -113,6 +113,7 @@ namespace CodeImp.DoomBuilder.Config
 		private readonly bool localsidedeftextureoffsets; //MaxW
 		private readonly bool effect3dfloorsupport;
 		private readonly bool planeequationsupport;
+		private readonly bool vertexheightsupport;
 		private readonly bool distinctfloorandceilingbrightness;
 		private readonly bool distinctwallbrightness;
 		private readonly bool distinctsidedefpartbrightness;
@@ -306,6 +307,7 @@ namespace CodeImp.DoomBuilder.Config
 		public bool UseLocalSidedefTextureOffsets { get { return localsidedeftextureoffsets; } } //MaxW
 		public bool Effect3DFloorSupport { get { return effect3dfloorsupport; } }
 		public bool PlaneEquationSupport { get { return planeequationsupport; } }
+		public bool VertexHeightSupport { get { return vertexheightsupport; } }
 		public bool DistinctFloorAndCeilingBrightness { get { return distinctfloorandceilingbrightness; } }
 		public bool DistinctWallBrightness { get { return distinctwallbrightness; } }
 		public bool DistinctSidedefPartBrightness { get { return distinctsidedefpartbrightness; } }
@@ -333,6 +335,7 @@ namespace CodeImp.DoomBuilder.Config
 		public List<FlagTranslation> ThingFlagsTranslation { get { return thingflagstranslation; } }
 		public Dictionary<string, ThingFlagsCompareGroup> ThingFlagsCompare { get { return thingflagscompare; } } //mxd
 		public Dictionary<string, string> ThingRenderStyles { get { return thingrenderstyles; } } //mxd
+		public IReadOnlyDictionary<int, ThingTypeInfo> ThingTypes { get { return things; } }
 		
 		// Linedefs
 		public IDictionary<string, string> LinedefFlags { get { return linedefflags; } }
@@ -499,6 +502,7 @@ namespace CodeImp.DoomBuilder.Config
 			localsidedeftextureoffsets = (cfg.ReadSetting("localsidedeftextureoffsets", false)); //MaxW
 			effect3dfloorsupport = cfg.ReadSetting("effect3dfloorsupport", false);
 			planeequationsupport = cfg.ReadSetting("planeequationsupport", false);
+			vertexheightsupport = cfg.ReadSetting("vertexheightsupport", false);
 			sidedeftextureskewing = cfg.ReadSetting("sidedeftextureskewing", false);
 			distinctfloorandceilingbrightness = cfg.ReadSetting("distinctfloorandceilingbrightness", false);
 			distinctwallbrightness = cfg.ReadSetting("distinctwallbrightness", false);

Source/Core/General/MapManager.cs

@@ -700,8 +700,8 @@ namespace CodeImp.DoomBuilder
 				{
 					// Problem! Can't save the map like this!
 					General.ShowErrorMessage("Unable to save the map: there are too many unique sidedefs!" + Environment.NewLine + Environment.NewLine
-						+ "Sidedefs before compresion: " + initialsidescount + Environment.NewLine
-						+ "Sidedefs after compresion: " + outputset.Sidedefs.Count
+						+ "Sidedefs before compression: " + initialsidescount + Environment.NewLine
+						+ "Sidedefs after compression: " + outputset.Sidedefs.Count
 						+ " (" + (outputset.Sidedefs.Count - io.MaxSidedefs) + " sidedefs above the limit)", MessageBoxButtons.OK);
 					General.MainWindow.DisplayStatus(oldstatus);
 					return false;

Source/Core/Windows/VertexEditForm.cs

@@ -94,6 +94,9 @@ namespace CodeImp.DoomBuilder.Windows
 				tabs.TabPages.Remove(tabcustom);
 				panelHeightControls.Visible = false;
 			}
+
+			if (!General.Map.Config.VertexHeightSupport)
+				panelHeightControls.Enabled = false;
 			
 			// Decimals allowed?
 			if(General.Map.FormatInterface.VertexDecimals > 0)

Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs

@@ -401,7 +401,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			}
 
 			//mxd
-			if(General.Map.UDMF && General.Settings.GZShowVisualVertices) 
+			if(General.Map.UDMF && General.Map.Config.VertexHeightSupport && General.Settings.GZShowVisualVertices) 
 			{
 				foreach(KeyValuePair<Vertex, VisualVertexPair> pair in vertices) 
 				{
@@ -652,7 +652,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			}
 
 			//mxd
-			if(General.Map.UDMF) 
+			if(General.Map.UDMF && General.Map.Config.VertexHeightSupport) 
 			{
 				foreach(KeyValuePair<Vertex, VisualVertexPair> pair in vertices)
 					pair.Value.Update();
@@ -1052,7 +1052,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 
 			// Find interesting things (such as sector slopes)
 			// Pass one of slope things, and determine which one are for pass two
-			//TODO: rewrite using classnames instead of numbers
+			//TODO: unfuck this because UDB decided to overhaul this...
 			foreach (Thing t in General.Map.Map.Things)
 			{
 				// SRB2
@@ -1327,7 +1327,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			}
 
 			// Pass two of slope things
-			//TODO: rewrite using classnames instead of numbers
+			//TODO: unfuck this because UDB decided to overhaul this...
 			foreach (Thing t in slopethingpass[1])
 			{
 				switch (t.Type)
@@ -1766,7 +1766,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 
 				//mxd
-				if(General.Map.UDMF && General.Settings.GZShowVisualVertices && vertices.Count > 0) 
+				if(General.Map.UDMF && General.Map.Config.VertexHeightSupport && General.Settings.GZShowVisualVertices && vertices.Count > 0) 
 				{
 					List<VisualVertex> verts = new List<VisualVertex>();