From fe35d20defd4249fbacfa7212dd30e9cf8af91b8 Mon Sep 17 00:00:00 2001 From: ColdVolcano Date: Sun, 23 Apr 2017 00:50:02 -0500 Subject: [PATCH] Remove not needed stuff (+typo fix) --- osu.Game/Screens/Menu/Intro.cs | 10 +--------- osu.Game/Screens/Menu/MainMenu.cs | 7 +++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index a899e483b4..fe32965e64 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -1,18 +1,14 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System.Threading.Tasks; using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Sample; using osu.Framework.Audio.Track; using osu.Framework.Configuration; -using osu.Framework.MathUtils; using osu.Framework.Screens; using osu.Framework.Graphics; -using osu.Game.Beatmaps; using osu.Game.Configuration; -using osu.Game.Database; using osu.Game.Graphics.Containers; using osu.Game.Screens.Backgrounds; using OpenTK.Graphics; @@ -64,13 +60,9 @@ namespace osu.Game.Screens.Menu private Bindable menuVoice; private Bindable menuMusic; - private TrackManager trackManager; - private BeatmapInfo beatmap; - private WorkingBeatmap song; - private int choosableBeatmapsetAmmout; [BackgroundDependencyLoader] - private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config, BeatmapDatabase beatmaps) + private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config) { menuVoice = config.GetBindable(OsuConfig.MenuVoice); menuMusic = config.GetBindable(OsuConfig.MenuMusic); diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 59ba52dc58..b2bb1ff29c 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -65,7 +65,6 @@ namespace osu.Game.Screens.Menu private TrackManager trackManager; private BeatmapInfo beatmap; private WorkingBeatmap song; - private int choosableBeatmapsetAmmout; [BackgroundDependencyLoader] private void load(OsuGame game, OsuConfigManager config, BeatmapDatabase beatmaps) @@ -76,10 +75,10 @@ namespace osu.Game.Screens.Menu if (!menuMusic) { trackManager = game.Audio.Track; - choosableBeatmapsetAmmout = beatmaps.Query().Count(); - if (choosableBeatmapsetAmmout > 0) + int choosableBeatmapsetAmmount = beatmaps.Query().Count(); + if (choosableBeatmapsetAmmount > 0) { - beatmap = beatmaps.GetWithChildren(RNG.Next(1, choosableBeatmapsetAmmout)).Beatmaps[0]; + beatmap = beatmaps.GetWithChildren(RNG.Next(1, choosableBeatmapsetAmmount)).Beatmaps[0]; song = beatmaps.GetWorkingBeatmap(beatmap); Beatmap = song; }