stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2024-11-10 06:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed, Sector drawing: sector height is set to 0 when the nearest sector's height is < 0 (previously default sector height was used when the nearest sector's height was <= 0).

Browse source
This commit is contained in:
MaxED 2016-11-10 00:35:29 +00:00 committed by spherallic
parent fe61fe3af8
commit 05bfa851c4
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Source/Core/Geometry/Tools.cs
View file

@ -583,14 +583,8 @@ namespace CodeImp.DoomBuilder.Geometry
newsector.Brightness = General.Settings.DefaultBrightness; newsector.Brightness = General.Settings.DefaultBrightness;
} }
//mxd. Better any height than none //mxd. Apply overrides?
if (newsector.CeilHeight - newsector.FloorHeight <= 0) if(useOverrides)
{
newsector.CeilHeight = newsector.FloorHeight + (General.Settings.DefaultCeilingHeight - General.Settings.DefaultFloorHeight);
}
//mxd. Apply overrides?
if (useOverrides)
{ {
if(General.Map.Options.OverrideCeilingTexture) newsector.SetCeilTexture(General.Map.Options.DefaultCeilingTexture); if(General.Map.Options.OverrideCeilingTexture) newsector.SetCeilTexture(General.Map.Options.DefaultCeilingTexture);
if(General.Map.Options.OverrideFloorTexture) newsector.SetFloorTexture(General.Map.Options.DefaultFloorTexture); if(General.Map.Options.OverrideFloorTexture) newsector.SetFloorTexture(General.Map.Options.DefaultFloorTexture);
@ -598,6 +592,11 @@ namespace CodeImp.DoomBuilder.Geometry
if(General.Map.Options.OverrideFloorHeight) newsector.FloorHeight = General.Map.Options.CustomFloorHeight; if(General.Map.Options.OverrideFloorHeight) newsector.FloorHeight = General.Map.Options.CustomFloorHeight;
if(General.Map.Options.OverrideBrightness) newsector.Brightness = General.Map.Options.CustomBrightness; if(General.Map.Options.OverrideBrightness) newsector.Brightness = General.Map.Options.CustomBrightness;
} }
//mxd. Avoid invalid height
else if(newsector.CeilHeight < newsector.FloorHeight)
{
newsector.CeilHeight = newsector.FloorHeight;
}
// Go for all sides to make sidedefs // Go for all sides to make sidedefs
foreach(LinedefSide ls in alllines) foreach(LinedefSide ls in alllines)

2
Source/Core/app.manifest
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/> <assemblyIdentity version="1.0.0.0" name="ZoneBuilder.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security> <security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"> <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">