Merge branch 'master' of github.com:ppy/osu into better-transforms

# Conflicts:
#	osu-framework
This commit is contained in:
Thomas Müller
2017-07-21 11:15:26 +02:00
17 changed files with 185 additions and 105 deletions

View File

@ -72,8 +72,6 @@ namespace osu.Game.Screens.Menu
menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
var trackManager = audio.Track;
BeatmapSetInfo setInfo = null;
if (!menuMusic)
@ -106,7 +104,6 @@ namespace osu.Game.Screens.Menu
Beatmap.Value = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
track = Beatmap.Value.Track;
trackManager.SetExclusive(track);
welcome = audio.Sample.Get(@"welcome");
seeya = audio.Sample.Get(@"seeya");
@ -121,7 +118,9 @@ namespace osu.Game.Screens.Menu
Scheduler.AddDelayed(delegate
{
track.Start();
// Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Manu.
if (menuMusic)
track.Start();
LoadComponentAsync(mainMenu = new MainMenu());

View File

@ -94,9 +94,7 @@ namespace osu.Game.Screens.Menu
{
if (!track.IsRunning)
{
track.Seek(metadata.PreviewTime);
if (metadata.PreviewTime == -1)
track.Seek(track.Length * 0.4f);
track.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * track.Length);
track.Start();
}
}