From 6f8d617347d842e6e7e8de2864bc09244de12a2c Mon Sep 17 00:00:00 2001 From: biwa <6475593+biwa@users.noreply.github.com> Date: Sat, 29 Jan 2022 18:59:24 +0100 Subject: [PATCH] Fixed typos introduced in 78ded20481cdf979be9047aff9e872f1ed28bbe1. --- Build/Configurations/Includes/ZDoom_common.cfg | 4 ++-- Source/Core/Config/GameConfiguration.cs | 6 +++--- Source/Core/Controls/SidedefPartLightControl.cs | 2 +- .../VisualModes/BaseVisualGeometrySidedef.cs | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Build/Configurations/Includes/ZDoom_common.cfg b/Build/Configurations/Includes/ZDoom_common.cfg index b5f0e935b..7b4af5a05 100755 --- a/Build/Configurations/Includes/ZDoom_common.cfg +++ b/Build/Configurations/Includes/ZDoom_common.cfg @@ -368,8 +368,8 @@ mapformat_udmf distinctfloorandceilingbrightness = true; distinctwallbrightness = true; - // Enabled setting brightness for upper, middle, and lower sidedef indenependtly from each other - distinectsidedefpartbrightness = true; + // Enabled setting brightness for upper, middle, and lower sidedef independently from each other + distinctsidedefpartbrightness = true; // Default nodebuilder configurations defaultsavecompiler = "zdbsp_udmf_normal"; diff --git a/Source/Core/Config/GameConfiguration.cs b/Source/Core/Config/GameConfiguration.cs index c62a9f233..62851f1df 100755 --- a/Source/Core/Config/GameConfiguration.cs +++ b/Source/Core/Config/GameConfiguration.cs @@ -112,7 +112,7 @@ namespace CodeImp.DoomBuilder.Config private readonly bool planeequationsupport; private readonly bool distinctfloorandceilingbrightness; private readonly bool distinctwallbrightness; - private readonly bool distinectsidedefpartbrightness; + private readonly bool distinctsidedefpartbrightness; // Skills private readonly List<SkillInfo> skills; @@ -287,7 +287,7 @@ namespace CodeImp.DoomBuilder.Config public bool PlaneEquationSupport { get { return planeequationsupport; } } public bool DistinctFloorAndCeilingBrightness { get { return distinctfloorandceilingbrightness; } } public bool DistinctWallBrightness { get { return distinctwallbrightness; } } - public bool DistinectSidedefPartBrightness { get { return distinectsidedefpartbrightness; } } + public bool DistinctSidedefPartBrightness { get { return distinctsidedefpartbrightness; } } // Texture/flat/voxel sources public IDictionary TextureRanges { get { return textureranges; } } @@ -464,7 +464,7 @@ namespace CodeImp.DoomBuilder.Config planeequationsupport = cfg.ReadSetting("planeequationsupport", false); distinctfloorandceilingbrightness = cfg.ReadSetting("distinctfloorandceilingbrightness", false); distinctwallbrightness = cfg.ReadSetting("distinctwallbrightness", false); - distinectsidedefpartbrightness = cfg.ReadSetting("distinectsidedefpartbrightness", false); + distinctsidedefpartbrightness = cfg.ReadSetting("distinctsidedefpartbrightness", false); for (int i = 0; i < Linedef.NUM_ARGS; i++) makedoorargs[i] = cfg.ReadSetting("makedoorarg" + i.ToString(CultureInfo.InvariantCulture), 0); //mxd. Update map format flags diff --git a/Source/Core/Controls/SidedefPartLightControl.cs b/Source/Core/Controls/SidedefPartLightControl.cs index ac5117ed9..44d40e37b 100644 --- a/Source/Core/Controls/SidedefPartLightControl.cs +++ b/Source/Core/Controls/SidedefPartLightControl.cs @@ -138,7 +138,7 @@ namespace CodeImp.DoomBuilder.Controls { reset.Visible = (cbAbsolute.CheckState != CheckState.Unchecked || light.GetResult(0) != 0); - if (!General.Map.Config.DistinectSidedefPartBrightness) + if (!General.Map.Config.DistinctSidedefPartBrightness) { lbLight.Enabled = false; light.Enabled = false; diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs index d62936969..2edbd2479 100755 --- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs +++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs @@ -524,7 +524,7 @@ namespace CodeImp.DoomBuilder.BuilderModes { string partstr = string.Empty, partstrabs = string.Empty; - if (General.Map.Config.DistinectSidedefPartBrightness) + if (General.Map.Config.DistinctSidedefPartBrightness) { switch (geometrytype) { @@ -545,7 +545,7 @@ namespace CodeImp.DoomBuilder.BuilderModes } bool lightglobalabsolute = Sidedef.Fields.GetValue("lightabsolute", false); - bool lightpartabsolute = General.Map.Config.DistinectSidedefPartBrightness ? Sidedef.Fields.GetValue(partstrabs, false) : false; + bool lightpartabsolute = General.Map.Config.DistinctSidedefPartBrightness ? Sidedef.Fields.GetValue(partstrabs, false) : false; lightabsolute = lightglobalabsolute || lightpartabsolute; bool affectedbyfog = General.Map.Data.MapInfo.HasFadeColor || (Sector.Sector.HasSkyCeiling && General.Map.Data.MapInfo.HasOutsideFogColor) || Sector.Sector.Fields.ContainsKey("fadecolor"); bool ignorelight = affectedbyfog && !Sidedef.IsFlagSet("lightfog") && !lightabsolute; @@ -561,7 +561,7 @@ namespace CodeImp.DoomBuilder.BuilderModes if(lightpartabsolute) lightvalue = Sidedef.Fields.GetValue(partstr, 0); else - lightvalue = Sidedef.Fields.GetValue("light", 0) + (General.Map.Config.DistinectSidedefPartBrightness ? Sidedef.Fields.GetValue(partstr, 0) : 0); + lightvalue = Sidedef.Fields.GetValue("light", 0) + (General.Map.Config.DistinctSidedefPartBrightness ? Sidedef.Fields.GetValue(partstr, 0) : 0); } if(ignorelight) lightabsolute = false; @@ -1588,12 +1588,12 @@ namespace CodeImp.DoomBuilder.BuilderModes public virtual void OnChangeTargetBrightness(bool up) { //mxd. Change UDMF wall light? - if(General.Map.UDMF && (General.Map.Config.DistinctWallBrightness || General.Map.Config.DistinectSidedefPartBrightness)) + if(General.Map.UDMF && (General.Map.Config.DistinctWallBrightness || General.Map.Config.DistinctSidedefPartBrightness)) { string fieldname = "light"; string fieldabsolutename = "lightabsolute"; - if(General.Map.Config.DistinectSidedefPartBrightness) + if(General.Map.Config.DistinctSidedefPartBrightness) { fieldname += "_" + partname; fieldabsolutename += "_" + partname; -- GitLab