RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-16 18:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use early return for if-pattern-matching.

Browse Source
This commit is contained in:
Huo Yaoyuan 2019-11-22 00:02:40 +08:00
parent 20f01ff3e9
commit 4cd7d67fe4
5 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
View File

@ -263,16 +263,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
/// <returns></returns>
private IList<HitSampleInfo> sampleInfoListAt(double time)
{
if (HitObject is IHasCurve curveData)
{
if (!(HitObject is IHasCurve curveData))
return HitObject.Samples;
double segmentTime = (curveData.EndTime - HitObject.StartTime) / curveData.SpanCount();
int index = (int)(segmentTime == 0 ? 0 : (time - HitObject.StartTime) / segmentTime);
return curveData.NodeSamples[index];
}
return HitObject.Samples;
}
}
}
}

8
osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
View File

@ -474,17 +474,15 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
/// <returns></returns>
private IList<HitSampleInfo> sampleInfoListAt(double time)
{
if (HitObject is IHasCurve curveData)
{
if (!(HitObject is IHasCurve curveData))
return HitObject.Samples;
double segmentTime = (EndTime - HitObject.StartTime) / spanCount;
int index = (int)(segmentTime == 0 ? 0 : (time - HitObject.StartTime) / segmentTime);
return curveData.NodeSamples[index];
}
return HitObject.Samples;
}
/// <summary>
/// Constructs and adds a note to a pattern.
/// </summary>

6
osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
View File

@ -380,8 +380,9 @@ namespace osu.Game.Rulesets.Osu.Tests
private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
{
if (judgedObject is DrawableOsuHitObject osuObject)
{
if (!(judgedObject is DrawableOsuHitObject osuObject))
return;
OsuSpriteText text;
Add(text = new OsuSpriteText
{
@ -401,4 +402,3 @@ namespace osu.Game.Rulesets.Osu.Tests
}
}
}
}

6
osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
View File

@ -22,8 +22,9 @@ namespace osu.Game.Rulesets.Osu.Mods
osuObject.Position = new Vector2(osuObject.Position.X, OsuPlayfield.BASE_SIZE.Y - osuObject.Y);
if (hitObject is Slider slider)
{
if (!(hitObject is Slider slider))
return;
slider.NestedHitObjects.OfType<SliderTick>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
slider.NestedHitObjects.OfType<RepeatPoint>().ForEach(h => h.Position = new Vector2(h.Position.X, OsuPlayfield.BASE_SIZE.Y - h.Position.Y));
@ -35,4 +36,3 @@ namespace osu.Game.Rulesets.Osu.Mods
}
}
}
}

6
osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
View File

@ -125,8 +125,9 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
foreach (var c in Children)
{
if (c is ScrollingTeam stc)
{
if (!(c is ScrollingTeam stc))
continue;
if (closest == null)
{
closest = stc;
@ -139,7 +140,6 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
if (o < lastOffset)
closest = stc;
}
}
Trace.Assert(closest != null, "closest != null");