From f115fecb23c13b7a2fbfc99e38b1eef458866199 Mon Sep 17 00:00:00 2001
From: Alchyr <isithalchyr@gmail.com>
Date: Thu, 9 Apr 2020 09:34:40 -0700
Subject: [PATCH] Fix formatting

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs           | 6 +++---
 osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs | 3 ++-
 osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs     | 3 ++-
 osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs     | 3 ++-
 osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs     | 6 +++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index 411a4441de..9599ad184b 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <summary>
         /// Whether this control point results in a meaningful change when placed after another.
         /// </summary>
-        /// <param name="other">Another control point to compare with.</param>
-        /// <param name="time">The time this timing point will be placed at.</param>
+        /// <param name="existing">An existing control point to compare with.</param>
+        /// <param name="time">The time this control point will be placed at if it is added.</param>
         /// <returns>Whether redundant.</returns>
-        public abstract bool IsRedundant(ControlPoint other, double time);
+        public abstract bool IsRedundant(ControlPoint existing, double time);
 
         public bool Equals(ControlPoint other) => Time == other?.Time && EquivalentTo(other);
     }
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 44522dc927..dc856b0a0a 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool EquivalentTo(ControlPoint other) =>
             other is DifficultyControlPoint otherTyped && otherTyped.SpeedMultiplier.Equals(SpeedMultiplier);
-        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
+
+        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index 8066c6b577..d050f44ba4 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is EffectControlPoint otherTyped &&
             KiaiMode == otherTyped.KiaiMode && OmitFirstBarLine == otherTyped.OmitFirstBarLine;
-        public override bool IsRedundant(ControlPoint other, double time) => !OmitFirstBarLine && EquivalentTo(other);
+
+        public override bool IsRedundant(ControlPoint existing, double time) => !OmitFirstBarLine && EquivalentTo(existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index cf7c842b24..38edbe70da 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -71,6 +71,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool EquivalentTo(ControlPoint other) =>
             other is SampleControlPoint otherTyped &&
             SampleBank == otherTyped.SampleBank && SampleVolume == otherTyped.SampleVolume;
-        public override bool IsRedundant(ControlPoint other, double time) => EquivalentTo(other);
+
+        public override bool IsRedundant(ControlPoint existing, double time) => EquivalentTo(existing);
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index d14ac1221b..316c603ece 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -52,8 +52,8 @@ namespace osu.Game.Beatmaps.ControlPoints
             other is TimingControlPoint otherTyped
             && TimeSignature == otherTyped.TimeSignature && BeatLength.Equals(otherTyped.BeatLength);
 
-        public override bool IsRedundant(ControlPoint other, double time) =>
-            EquivalentTo(other)
-            && other.Time == time;
+        public override bool IsRedundant(ControlPoint existing, double time) =>
+            EquivalentTo(existing)
+            && existing.Time == time;
     }
 }