1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 18:47:27 +08:00

Merge pull request #1894 from Aergwyn/remove-empty-lines

Remove unnecessary empty lines
This commit is contained in:
Dan Balasescu 2018-01-14 00:13:50 +09:00 committed by GitHub
commit 093db77c62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 1 additions and 26 deletions

View File

@ -43,7 +43,6 @@ namespace osu.Desktop
host.Run(new OsuGameDesktop(args)); host.Run(new OsuGameDesktop(args));
break; break;
} }
} }
return 0; return 0;
} }

View File

@ -23,7 +23,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
} }
} }
public abstract class DrawableCatchHitObject<TObject> : DrawableCatchHitObject public abstract class DrawableCatchHitObject<TObject> : DrawableCatchHitObject
where TObject : CatchHitObject where TObject : CatchHitObject
{ {

View File

@ -58,7 +58,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
protected override Beatmap<ManiaHitObject> ConvertBeatmap(Beatmap original) protected override Beatmap<ManiaHitObject> ConvertBeatmap(Beatmap original)
{ {
BeatmapDifficulty difficulty = original.BeatmapInfo.BaseDifficulty; BeatmapDifficulty difficulty = original.BeatmapInfo.BaseDifficulty;
int seed = (int)Math.Round(difficulty.DrainRate + difficulty.CircleSize) * 20 + (int)(difficulty.OverallDifficulty * 41.2) + (int)Math.Round(difficulty.ApproachRate); int seed = (int)Math.Round(difficulty.DrainRate + difficulty.CircleSize) * 20 + (int)(difficulty.OverallDifficulty * 41.2) + (int)Math.Round(difficulty.ApproachRate);

View File

@ -93,7 +93,6 @@ namespace osu.Game.Rulesets.Mania.Objects
Column = Column Column = Column
}); });
} }
} }
/// <summary> /// <summary>

View File

@ -566,7 +566,6 @@ namespace osu.Game.Beatmaps
using (var stream = new StreamReader(reader.GetStream(mapName))) using (var stream = new StreamReader(reader.GetStream(mapName)))
metadata = Decoder.GetDecoder(stream).DecodeBeatmap(stream).Metadata; metadata = Decoder.GetDecoder(stream).DecodeBeatmap(stream).Metadata;
// check if a set already exists with the same online id. // check if a set already exists with the same online id.
if (metadata.OnlineBeatmapSetID != null) if (metadata.OnlineBeatmapSetID != null)
beatmapSet = beatmaps.BeatmapSets.FirstOrDefault(b => b.OnlineBeatmapSetID == metadata.OnlineBeatmapSetID); beatmapSet = beatmaps.BeatmapSets.FirstOrDefault(b => b.OnlineBeatmapSetID == metadata.OnlineBeatmapSetID);
@ -581,7 +580,6 @@ namespace osu.Game.Beatmaps
Metadata = metadata Metadata = metadata
}; };
var mapNames = reader.Filenames.Where(f => f.EndsWith(".osu")); var mapNames = reader.Filenames.Where(f => f.EndsWith(".osu"));
foreach (var name in mapNames) foreach (var name in mapNames)
@ -693,7 +691,6 @@ namespace osu.Game.Beatmaps
{ {
try try
{ {
using (var beatmap = new StreamReader(store.GetStream(getPathForFile(BeatmapInfo.Path)))) using (var beatmap = new StreamReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
{ {
Decoder decoder = Decoder.GetDecoder(beatmap); Decoder decoder = Decoder.GetDecoder(beatmap);

View File

@ -27,7 +27,6 @@ namespace osu.Game.Beatmaps
Beatmap = CreateBeatmapConverter(beatmap).Convert(beatmap); Beatmap = CreateBeatmapConverter(beatmap).Convert(beatmap);
Mods = mods ?? new Mod[0]; Mods = mods ?? new Mod[0];
ApplyMods(Mods); ApplyMods(Mods);
PreprocessHitObjects(); PreprocessHitObjects();

View File

@ -137,7 +137,7 @@ namespace osu.Game.Beatmaps.Formats
CentreRight, CentreRight,
BottomLeft, BottomLeft,
BottomRight BottomRight
}; }
internal enum StoryLayer internal enum StoryLayer
{ {

View File

@ -180,7 +180,6 @@ namespace osu.Game.Graphics.UserInterface
} }
} }
protected class OsuTabDropdownHeader : OsuDropdownHeader protected class OsuTabDropdownHeader : OsuDropdownHeader
{ {
public override Color4 AccentColour public override Color4 AccentColour

View File

@ -56,7 +56,6 @@ namespace osu.Game.Online.API
} }
catch catch
{ {
} }
return null; return null;
} }

View File

@ -219,7 +219,6 @@ namespace osu.Game.Overlays.Chat
} }
else else
contentFlow.Text = message.Content; contentFlow.Text = message.Content;
} }
private class MessageSender : OsuClickableContainer, IHasContextMenu private class MessageSender : OsuClickableContainer, IHasContextMenu

View File

@ -65,7 +65,6 @@ namespace osu.Game.Overlays.Direct
Colour = Color4.Black.Opacity(0.3f), Colour = Color4.Black.Opacity(0.3f),
}; };
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay) private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay)
{ {

View File

@ -183,8 +183,6 @@ namespace osu.Game.Overlays.MedalSplash
description.FadeInFromZero(duration * 2); description.FadeInFromZero(duration * 2);
break; break;
} }
} }
} }

View File

@ -148,7 +148,6 @@ namespace osu.Game.Overlays.Music
private class PlaylistItemHandle : SpriteIcon private class PlaylistItemHandle : SpriteIcon
{ {
public PlaylistItemHandle() public PlaylistItemHandle()
{ {
Anchor = Anchor.TopLeft; Anchor = Anchor.TopLeft;

View File

@ -230,7 +230,6 @@ namespace osu.Game.Overlays.Music
items.ChangeChildDepth(draggedItem, dstIndex); items.ChangeChildDepth(draggedItem, dstIndex);
} }
private class ItemSearchContainer : FillFlowContainer<PlaylistItem>, IHasFilterableChildren private class ItemSearchContainer : FillFlowContainer<PlaylistItem>, IHasFilterableChildren
{ {
public IEnumerable<string> FilterTerms => new string[] { }; public IEnumerable<string> FilterTerms => new string[] { };

View File

@ -168,5 +168,4 @@ namespace osu.Game.Overlays.Notifications
// the layout portion of this is being tracked as a framework issue (https://github.com/ppy/osu-framework/issues/1297). // the layout portion of this is being tracked as a framework issue (https://github.com/ppy/osu-framework/issues/1297).
protected override bool RequiresChildrenUpdate => true; protected override bool RequiresChildrenUpdate => true;
} }
} }

View File

@ -5,7 +5,6 @@ using osu.Framework.Allocation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
namespace osu.Game.Overlays.Notifications namespace osu.Game.Overlays.Notifications
{ {
public class ProgressCompletionNotification : SimpleNotification public class ProgressCompletionNotification : SimpleNotification

View File

@ -217,7 +217,6 @@ namespace osu.Game.Overlays.Notifications
}; };
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {

View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Rulesets.Objects.Types namespace osu.Game.Rulesets.Objects.Types
{ {
/// <summary> /// <summary>

View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Rulesets.Objects.Types namespace osu.Game.Rulesets.Objects.Types
{ {
/// <summary> /// <summary>

View File

@ -52,7 +52,6 @@ namespace osu.Game.Rulesets.Replays
protected ReplayFrame() protected ReplayFrame()
{ {
} }
public ReplayFrame(double time, float? mouseX, float? mouseY, ReplayButtonState buttonState) public ReplayFrame(double time, float? mouseX, float? mouseY, ReplayButtonState buttonState)

View File

@ -5,6 +5,5 @@ namespace osu.Game.Screens.Backgrounds
{ {
public class BackgroundScreenEmpty : BackgroundScreen public class BackgroundScreenEmpty : BackgroundScreen
{ {
} }
} }

View File

@ -157,7 +157,6 @@ namespace osu.Game.Screens.Menu
return true; return true;
} }
return false; return false;
} }

View File

@ -229,7 +229,6 @@ namespace osu.Game.Screens.Multiplayer
{ {
coverContainer.FadeIn(transition_duration); coverContainer.FadeIn(transition_duration);
LoadComponentAsync(new BeatmapSetCover(value.BeatmapSet) LoadComponentAsync(new BeatmapSetCover(value.BeatmapSet)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,