stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-17 01:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Map Analysis mode: added "Browse Texture" fix to "Missing Texture" and "Unknown Texture" error results.

Browse source 
Map Analysis mode: added "Browse Flat" fix to "Missing Flat" and "Unknown Flat" error results.
Fixed several typos in ZDoom_misc.cfg.
This commit is contained in:
MaxED 2015-01-07 18:32:48 +00:00
parent bb263448b0
commit 297d7d281b
6 changed files with 100 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Build/Configurations/Includes/ZDoom_misc.cfg
View file

@ -641,10 +641,10 @@ enums
scroll_speeds
{
16 = "16: Very slow";
32 = "64: Slow";
32 = "32: Slow";
64 = "64: Normal";
96 = "64: Flast";
128 = "64: Very fast";
96 = "96: Fast";
128 = "128: Very fast";
}
stair_speeds

23
Source/Plugins/BuilderModes/ErrorChecks/ResultMissingFlat.cs
View file

@ -15,13 +15,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
private readonly Sector sector;
private readonly bool ceiling;
private static string imagename = "-"; //mxd
#endregion
#region ================== Properties
public override int Buttons { get { return 1; } }
public override int Buttons { get { return 2; } }
public override string Button1Text { get { return "Add Default Flat"; } }
public override string Button2Text { get { return "Browse Flat"; } } //mxd
#endregion
@ -35,9 +37,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.ceiling = ceiling;
this.viewobjects.Add(s);
this.hidden = s.IgnoredErrorChecks.Contains(this.GetType()); //mxd
imagename = "-"; //mxd
string objname = ceiling ? "ceiling" : "floor";
this.description = "This sector's " + objname + " is missing a flat where it is required and could cause a 'Hall Of Mirrors' visual problem in the map. Click the 'Add Default Flat' button to add a flat to the sector.";
this.description = "This sector's " + objname + " is missing a flat where it is required and could cause a 'Hall Of Mirrors' visual problem in the map.";
}
#endregion
@ -84,6 +87,22 @@ namespace CodeImp.DoomBuilder.BuilderModes
sector.SetFloorTexture(General.Map.Options.DefaultFloorTexture);
General.Map.Map.Update();
General.Map.Data.UpdateUsedTextures();
return true;
}
//mxd. Fix by picking a flat
public override bool Button2Click(bool batchMode)
{
if(!batchMode) General.Map.UndoRedo.CreateUndo("Missing flat correction");
if(imagename == "-") imagename = General.Interface.BrowseFlat(General.Interface, imagename);
if(imagename == "-") return false;
if(ceiling) sector.SetCeilTexture(imagename);
else sector.SetFloorTexture(imagename);
General.Map.Map.Update();
General.Map.Data.UpdateUsedTextures();
return true;
}

25
Source/Plugins/BuilderModes/ErrorChecks/ResultMissingTexture.cs
View file

@ -31,13 +31,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
private readonly Sidedef side;
private readonly SidedefPart part;
private static string imagename = "-"; //mxd
#endregion
#region ================== Properties
public override int Buttons { get { return 1; } }
public override int Buttons { get { return 2; } }
public override string Button1Text { get { return "Add Default Texture"; } }
public override string Button2Text { get { return "Browse Texture"; } } //mxd
#endregion
@ -51,7 +53,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.part = part;
this.viewobjects.Add(sd);
this.hidden = sd.IgnoredErrorChecks.Contains(this.GetType()); //mxd
this.description = "This sidedef is missing a texture where it is required and could cause a 'Hall Of Mirrors' visual problem in the map. Click the 'Add Default Texture' button to add a texture to the line.";
imagename = "-"; //mxd
this.description = "This sidedef is missing a texture where it is required and could cause a 'Hall Of Mirrors' visual problem in the map.";
}
#endregion
@ -112,6 +115,24 @@ namespace CodeImp.DoomBuilder.BuilderModes
return true;
}
//mxd. Fix by picking a texture
public override bool Button2Click(bool batchMode)
{
if(!batchMode) General.Map.UndoRedo.CreateUndo("Missing texture correction");
if(imagename == "-") imagename = General.Interface.BrowseTexture(General.Interface, imagename);
if(imagename == "-") return false;
switch(part)
{
case SidedefPart.Upper: side.SetTextureHigh(imagename); break;
case SidedefPart.Middle: side.SetTextureMid(imagename); break;
case SidedefPart.Lower: side.SetTextureLow(imagename); break;
}
General.Map.Map.Update();
return true;
}
#endregion
}
}

24
Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownFlat.cs
View file

@ -31,13 +31,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
private readonly Sector sector;
private readonly bool ceiling;
private static string imagename = "-"; //mxd
#endregion
#region ================== Properties
public override int Buttons { get { return 1; } }
public override int Buttons { get { return 2; } }
public override string Button1Text { get { return "Add Default Flat"; } }
public override string Button2Text { get { return "Browse Flat"; } } //mxd
#endregion
@ -51,8 +53,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.ceiling = ceiling;
this.viewobjects.Add(s);
this.hidden = s.IgnoredErrorChecks.Contains(this.GetType()); //mxd
imagename = "-"; //mxd
string objname = ceiling ? "ceiling" : "floor";
this.description = "This sector's " + objname + " uses an unknown flat. This could be the result of missing resources, or a mistyped flat name. Click the 'Add Default Flat' button to use a known flat instead.";
this.description = "This sector's " + objname + " uses an unknown flat. This could be the result of missing resources, or a mistyped flat name.";
}
#endregion
@ -102,6 +106,22 @@ namespace CodeImp.DoomBuilder.BuilderModes
sector.SetFloorTexture(General.Map.Options.DefaultFloorTexture);
General.Map.Map.Update();
General.Map.Data.UpdateUsedTextures();
return true;
}
//mxd. Fix by picking a flat
public override bool Button2Click(bool batchMode)
{
if(!batchMode) General.Map.UndoRedo.CreateUndo("Unknown flat correction");
if(imagename == "-") imagename = General.Interface.BrowseFlat(General.Interface, imagename);
if(imagename == "-") return false;
if(ceiling) sector.SetCeilTexture(imagename);
else sector.SetFloorTexture(imagename);
General.Map.Map.Update();
General.Map.Data.UpdateUsedTextures();
return true;
}

25
Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownTexture.cs
View file

@ -31,14 +31,16 @@ namespace CodeImp.DoomBuilder.BuilderModes
private readonly Sidedef side;
private readonly SidedefPart part;
private static string imagename = "-"; //mxd
#endregion
#region ================== Properties
public override int Buttons { get { return 2; } }
public override int Buttons { get { return 3; } }
public override string Button1Text { get { return "Remove Texture"; } }
public override string Button2Text { get { return "Add Default Texture"; } }
public override string Button3Text { get { return "Browse Texture"; } } //mxd
#endregion
@ -52,7 +54,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.part = part;
this.viewobjects.Add(sd);
this.hidden = sd.IgnoredErrorChecks.Contains(this.GetType()); //mxd
this.description = "This sidedef uses an unknown texture. This could be the result of missing resources, or a mistyped texture name. Click the 'Remove Texture' button to remove the texture or click on 'Add Default Texture' to use a known texture instead.";
imagename = "-"; //mxd
this.description = "This sidedef uses an unknown texture. This could be the result of missing resources, or a mistyped texture name.";
}
#endregion
@ -125,6 +128,24 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Map.Map.Update();
return true;
}
//mxd. Fix by picking a texture
public override bool Button3Click(bool batchMode)
{
if(!batchMode) General.Map.UndoRedo.CreateUndo("Unknown texture correction");
if(imagename == "-") imagename = General.Interface.BrowseTexture(General.Interface, imagename);
if(imagename == "-") return false;
switch(part)
{
case SidedefPart.Upper: side.SetTextureHigh(imagename); break;
case SidedefPart.Middle: side.SetTextureMid(imagename); break;
case SidedefPart.Lower: side.SetTextureLow(imagename); break;
}
General.Map.Map.Update();
return true;
}
#endregion
}

16
Source/Plugins/BuilderModes/Interface/ErrorCheckForm.cs
View file

@ -297,7 +297,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
fix1.Visible = false;
fix2.Visible = false;
fix3.Visible = false;
cbApplyToAll.Visible = false;//mxd
cbApplyToAll.Visible = false; //mxd
}
// This runs in a seperate thread to manage the checking threads
@ -460,10 +460,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
fix1.Text = r.Button1Text;
fix2.Text = r.Button2Text;
fix3.Text = r.Button3Text;
fix1.Visible = (r.Buttons >= 1);
fix2.Visible = (r.Buttons >= 2);
fix3.Visible = (r.Buttons >= 3);
cbApplyToAll.Visible = true;//mxd
fix1.Visible = (r.Buttons > 0);
fix2.Visible = (r.Buttons > 1);
fix3.Visible = (r.Buttons > 2);
cbApplyToAll.Visible = (r.Buttons > 0); //mxd
r.ZoomToObject();
}
else
@ -569,9 +569,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
ErrorResult r = item as ErrorResult;
if (fixIndex == 1) r.Button1Click(true);
else if(fixIndex == 2) r.Button2Click(true);
else if(fixIndex == 3) r.Button3Click(true);
if (fixIndex == 1 && !r.Button1Click(true)) break;
if (fixIndex == 2 && !r.Button2Click(true)) break;
if (fixIndex == 3 && !r.Button3Click(true)) break;
}
}