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

Merge pull request #11290 from bdach/looping-mp-at-end-of-game

Browse Source 
Fix multiplayer gameplay potentially looping audio after reaching end
This commit is contained in:
Dean Herbert 2020-12-25 00:04:56 +09:00 committed by GitHub
commit 61be6197e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,6 +202,11 @@ namespace osu.Game.Screens.Multi
{
this.FadeIn();
waves.Show();
if (loungeSubScreen.IsCurrentScreen())
loungeSubScreen.OnEntering(last);
else
loungeSubScreen.MakeCurrent();
}
public override void OnResuming(IScreen last)
@ -209,6 +214,7 @@ namespace osu.Game.Screens.Multi
this.FadeIn(250);
this.ScaleTo(1, 250, Easing.OutSine);
screenStack.CurrentScreen?.OnResuming(last);
base.OnResuming(last);
UpdatePollingRate(isIdle.Value);
@ -219,6 +225,8 @@ namespace osu.Game.Screens.Multi
this.ScaleTo(1.1f, 250, Easing.InSine);
this.FadeOut(250);
screenStack.CurrentScreen?.OnSuspending(next);
UpdatePollingRate(isIdle.Value);
}
@ -230,9 +238,7 @@ namespace osu.Game.Screens.Multi
this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
if (screenStack.CurrentScreen != null)
loungeSubScreen.MakeCurrent();
screenStack.CurrentScreen?.OnExiting(next);
base.OnExiting(next);
return false;
}