From 4fce0c11891fdc8fbc7457391a8b9d406574e785 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Mon, 29 May 2017 15:01:13 +0900 Subject: [PATCH] Rename Barline -> BarLine. --- osu.Game.Rulesets.Mania/Objects/{Barline.cs => BarLine.cs} | 2 +- .../Drawables/{DrawableBarline.cs => DrawableBarLine.cs} | 6 +++--- osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs | 2 +- osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs | 2 +- osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename osu.Game.Rulesets.Mania/Objects/{Barline.cs => BarLine.cs} (92%) rename osu.Game.Rulesets.Mania/Objects/Drawables/{DrawableBarline.cs => DrawableBarLine.cs} (92%) diff --git a/osu.Game.Rulesets.Mania/Objects/Barline.cs b/osu.Game.Rulesets.Mania/Objects/BarLine.cs similarity index 92% rename from osu.Game.Rulesets.Mania/Objects/Barline.cs rename to osu.Game.Rulesets.Mania/Objects/BarLine.cs index 9b229a8d52..b635977fd1 100644 --- a/osu.Game.Rulesets.Mania/Objects/Barline.cs +++ b/osu.Game.Rulesets.Mania/Objects/BarLine.cs @@ -3,7 +3,7 @@ using osu.Game.Rulesets.Objects; namespace osu.Game.Rulesets.Mania.Objects { - public class Barline : ManiaHitObject + public class BarLine : ManiaHitObject { /// /// The control point which this bar line is part of. diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarline.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs similarity index 92% rename from osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarline.cs rename to osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs index eee32a9da3..9b1e1e4e3d 100644 --- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarline.cs +++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs @@ -12,12 +12,12 @@ using osu.Game.Rulesets.Objects.Drawables; namespace osu.Game.Rulesets.Mania.Objects.Drawables { /// - /// Visualises a . Although this derives DrawableManiaHitObject, + /// Visualises a . Although this derives DrawableManiaHitObject, /// this does not handle input/sound like a normal hit object. /// - public class DrawableBarline : DrawableManiaHitObject + public class DrawableBarLine : DrawableManiaHitObject { - public DrawableBarline(Barline hitObject) + public DrawableBarLine(BarLine hitObject) : base(hitObject, null) { AutoSizeAxes = Axes.Y; diff --git a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs index 871306b98c..4ddb7ad42a 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs @@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Mania.UI int index = 0; for (double t = timingPoints[i].Time; Precision.DefinitelyBigger(endTime, t); t += point.BeatLength, index++) { - maniaPlayfield.Add(new DrawableBarline(new Barline + maniaPlayfield.Add(new DrawableBarLine(new BarLine { StartTime = t, ControlPoint = point, diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs index dcf725e091..d1b6fbaf7c 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs @@ -207,7 +207,7 @@ namespace osu.Game.Rulesets.Mania.UI } public override void Add(DrawableHitObject h) => Columns.ElementAt(h.HitObject.Column).Add(h); - public void Add(DrawableBarline barline) => barlineContainer.Add(barline); + public void Add(DrawableBarLine barline) => barlineContainer.Add(barline); protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) { diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj index cc5e6dd81e..3d5614bd90 100644 --- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj +++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj @@ -62,7 +62,7 @@ - + @@ -71,7 +71,7 @@ - +