h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 08:42:55 +08:00
Code Issues Releases Wiki Activity

Restore multiplayer to use beatmap track

Browse Source
This commit is contained in:
Dean Herbert 2020-08-21 16:59:11 +09:00
parent 70697cf1a0
commit a47b8222b5
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Screens.Multi
private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
[Resolved]
private MusicController musicController { get; set; }
private MusicController music { get; set; }
[Cached(Type = typeof(IRoomManager))]
private RoomManager roomManager;
@ -343,10 +343,15 @@ namespace osu.Game.Screens.Multi
{
if (screenStack.CurrentScreen is MatchSubScreen)
{
musicController.CurrentTrack.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
musicController.CurrentTrack.Looping = true;
var track = Beatmap.Value?.Track;
musicController.EnsurePlayingSomething();
if (track != null)
{
track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
track.Looping = true;
music.EnsurePlayingSomething();
}
}
else
{
@ -356,8 +361,13 @@ namespace osu.Game.Screens.Multi
private void cancelLooping()
{
musicController.CurrentTrack.Looping = false;
musicController.CurrentTrack.RestartPoint = 0;
var track = Beatmap?.Value?.Track;
if (track != null)
{
track.Looping = false;
track.RestartPoint = 0;
}
}
protected override void Dispose(bool isDisposing)