From bb6b656ec688b6139bb5923d743e842949129766 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 12 Oct 2017 22:27:22 +0900 Subject: [PATCH] Fix code review issues --- osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs | 4 +--- osu.Game.Rulesets.Catch/Objects/JuiceStream.cs | 2 +- osu.Game/Rulesets/Objects/SliderCurve.cs | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs index cffb2981bf..4c28a9d021 100644 --- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs +++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs @@ -12,14 +12,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable { public class DrawableFruit : DrawableCatchHitObject { - private const float pulp_size = 20; - public DrawableFruit(Fruit h) : base(h) { Origin = Anchor.Centre; - Size = new Vector2(pulp_size * 2.2f, pulp_size * 2.8f); + Size = new Vector2(Pulp.PULP_SIZE * 2.2f, Pulp.PULP_SIZE * 2.8f); AccentColour = HitObject.ComboColour; Masking = false; diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs index f49799970d..6462f6f6a8 100644 --- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs +++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs @@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Objects public class JuiceStream : CatchBaseHit, IHasCurve { /// - /// Scoring distance with a speed-adjusted beat length of 1 second. + /// Positional distance that results in a duration of one second, before any speed adjustments. /// private const float base_scoring_distance = 100; diff --git a/osu.Game/Rulesets/Objects/SliderCurve.cs b/osu.Game/Rulesets/Objects/SliderCurve.cs index f920f97790..363c330d3d 100644 --- a/osu.Game/Rulesets/Objects/SliderCurve.cs +++ b/osu.Game/Rulesets/Objects/SliderCurve.cs @@ -15,8 +15,6 @@ public class SliderCurve public List ControlPoints; - public double Scale = 1; - public CurveType CurveType = CurveType.PerfectCurve; public Vector2 Offset; @@ -202,4 +200,4 @@ public Vector2 PositionAt(double progress) return interpolateVertices(indexOfDistance(d), d) + Offset; } } -} \ No newline at end of file +}