- Fixed a bug that allowed to use texture names longer than 8 characters, making the WAD file unusable after saving

@ added a texturenamelength config var. Setting it to higher than 8 may result in unexpected behaviour due to the speed optimizations relying on 8 char texture names and should not be changed for now.

Build/Configurations/Boom.cfg

@@ -72,6 +72,10 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
 
 /*
 TEXTURES AND FLAT SOURCES

Build/Configurations/Doom.cfg

@@ -73,6 +73,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Doom2.cfg

@@ -73,6 +73,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Edge.cfg

@@ -72,6 +72,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Eternity_Doom.cfg

@@ -72,6 +72,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Eternity_DoomUDMF.cfg

@@ -77,6 +77,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Heretic.cfg

@@ -73,6 +73,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Hexen.cfg

@@ -83,6 +83,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Legacy.cfg

@@ -72,6 +72,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Risen3D.cfg

@@ -72,6 +72,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Skulltag_Doom.cfg

@@ -75,6 +75,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Skulltag_DoomHexen.cfg

@@ -86,6 +86,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/Strife.cfg

@@ -73,6 +73,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY001";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/UltDoom.cfg

@@ -73,6 +73,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/ZDoom_Doom.cfg

@@ -75,6 +75,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/ZDoom_DoomHexen.cfg

@@ -86,6 +86,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/ZDoom_DoomUDMF.cfg

@@ -96,6 +96,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/ZDoom_HereticHexen.cfg

@@ -85,6 +85,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/ZDoom_Hexen.cfg

@@ -85,6 +85,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/ZDoom_StrifeHexen.cfg

@@ -85,6 +85,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY001";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Build/Configurations/jDoom.cfg

@@ -72,6 +72,11 @@ defaultthingflags
 // Flat used as sky (for missing textures check)
 skyflatname = "F_SKY1";
 
+// Maximum length of texture name length in characters (<= 0 for unlimited)
+// WARNING: changing this may destroy your WAD file. Only change it when
+// you know what you're doing!
+maxtexturenamelength = 8;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures

Source/Core/Config/GameConfiguration.cs

@@ -71,6 +71,7 @@ namespace CodeImp.DoomBuilder.Config
 		private bool linetagindicatesectors;
 		private string decorategames;
         private string skyflatname;
+		private int maxtexturenamelength;
 		
 		// Skills
 		private List<SkillInfo> skills;
@@ -153,6 +154,7 @@ namespace CodeImp.DoomBuilder.Config
 		public bool LineTagIndicatesSectors { get { return linetagindicatesectors ; } }
 		public string DecorateGames { get { return decorategames; } }
         public string SkyFlatName { get { return skyflatname; } }
+		public int MaxTextureNamelength { get { return maxtexturenamelength; } }
 		
 		// Skills
 		public List<SkillInfo> Skills { get { return skills; } }
@@ -256,6 +258,7 @@ namespace CodeImp.DoomBuilder.Config
 			linetagindicatesectors = cfg.ReadSetting("linetagindicatesectors", false);
 			decorategames = cfg.ReadSetting("decorategames", "");
             skyflatname = cfg.ReadSetting("skyflatname", "F_SKY1");
+			maxtexturenamelength = cfg.ReadSetting("maxtexturenamelength", 8);
 			for(int i = 0; i < Linedef.NUM_ARGS; i++) makedoorargs[i] = cfg.ReadSetting("makedoorarg" + i.ToString(CultureInfo.InvariantCulture), 0);
 			
 			// Flags have special (invariant culture) conversion

Source/Core/Controls/ImageSelectorControl.Designer.cs

@@ -55,6 +55,7 @@ namespace CodeImp.DoomBuilder.Controls
 			this.name.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
 			this.name.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.name.Location = new System.Drawing.Point(0, 64);
+			this.name.MaxLength = 8;
 			this.name.Name = "name";
 			this.name.Size = new System.Drawing.Size(68, 20);
 			this.name.TabIndex = 2;

Source/Core/Controls/ImageSelectorControl.cs

@@ -65,6 +65,9 @@ namespace CodeImp.DoomBuilder.Controls
 		{
 			// Initialize
 			InitializeComponent();
+
+			// set the max length of texture names
+			name.MaxLength = General.Map.Config.MaxTextureNamelength;
 		}
 		
 		#endregion

Source/Core/ZDoom/TexturesParser.cs

@@ -92,18 +92,34 @@ namespace CodeImp.DoomBuilder.ZDoom
 						// Read texture structure
 						TextureStructure tx = new TextureStructure(this);
 						if(this.HasError) break;
-						
-						// Add the texture
-						textures.Add(tx);
+
+						// if a limit for the texture name length is set make sure that it's not exceeded
+						if ((General.Map.Config.MaxTextureNamelength > 0) && (tx.Name.Length > General.Map.Config.MaxTextureNamelength))
+						{
+							General.ErrorLogger.Add(ErrorType.Error, "Texture name \"" + tx.Name + "\" too long. Texture names must have a length of " + General.Map.Config.MaxTextureNamelength.ToString() + " characters or less");
+						}
+						else
+						{
+							// Add the texture
+							textures.Add(tx);
+						}
 					}
 					else if(objdeclaration == "sprite")
 					{
 						// Read sprite structure
 						TextureStructure tx = new TextureStructure(this);
 						if(this.HasError) break;
-						
-						// Add the sprite
-						sprites.Add(tx);
+
+						// if a limit for the sprite name length is set make sure that it's not exceeded
+						if ((General.Map.Config.MaxTextureNamelength > 0) && (tx.Name.Length > General.Map.Config.MaxTextureNamelength))
+						{
+							General.ErrorLogger.Add(ErrorType.Error, "Sprite name \"" + tx.Name + "\" too long. Sprite names must have a length of " +  General.Map.Config.MaxTextureNamelength.ToString() + " characters or less");
+						}
+						else
+						{
+							// Add the sprite
+							sprites.Add(tx);
+						}
 					}
 					else
 					{