sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'spectator-replay-watcher' into spectator-listing

Browse Source
This commit is contained in:
Dean Herbert
2020-10-28 23:17:50 +09:00
parent dd2f44f393 6c2cee7b3f
commit e1bf751dac
2 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Screens/Play/Spectator.cs
View File

@ -76,6 +76,11 @@ namespace osu.Game.Screens.Play
private BeatmapSetInfo onlineBeatmap;
/// <summary>
/// Becomes true if a new state is waiting to be loaded (while this screen was not active).
/// </summary>
private bool newStatePending;
public Spectator([NotNull] User targetUser)
{
this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
@ -218,11 +223,23 @@ namespace osu.Game.Screens.Play
if (userId != targetUser.Id)
return;
replay ??= new Replay { HasReceivedAllFrames = false };
this.state = state;
Schedule(attemptStart);
if (this.IsCurrentScreen())
Schedule(attemptStart);
else
newStatePending = true;
}
public override void OnResuming(IScreen last)
{
base.OnResuming(last);
if (newStatePending)
{
attemptStart();
newStatePending = false;
}
}
private void userFinishedPlaying(int userId, SpectatorState state)
@ -266,8 +283,7 @@ namespace osu.Game.Screens.Play
return;
}
if (replay == null)
return;
replay ??= new Replay { HasReceivedAllFrames = false };
var scoreInfo = new ScoreInfo
{