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

Give SpectatorState a user state

Browse Source
This commit is contained in:
Dan Balasescu
2022-02-01 15:51:41 +09:00
parent 38e075c522
commit 41007169f7
6 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Online/Spectator/SpectatorClient.cs
View File

@ -138,6 +138,7 @@ namespace osu.Game.Online.Spectator
currentState.BeatmapID = score.ScoreInfo.BeatmapInfo.OnlineID;
currentState.RulesetID = score.ScoreInfo.RulesetID;
currentState.Mods = score.ScoreInfo.Mods.Select(m => new APIMod(m)).ToArray();
currentState.State = SpectatingUserState.Playing;
currentBeatmap = state.Beatmap;
currentScore = score;
@ -148,7 +149,7 @@ namespace osu.Game.Online.Spectator
public void SendFrames(FrameDataBundle data) => lastSend = SendFramesInternal(data);
public void EndPlaying()
public void EndPlaying(GameplayState state)
{
// This method is most commonly called via Dispose(), which is can be asynchronous (via the AsyncDisposalQueue).
// We probably need to find a better way to handle this...
@ -163,6 +164,13 @@ namespace osu.Game.Online.Spectator
IsPlaying = false;
currentBeatmap = null;
if (state.HasPassed)
currentState.State = SpectatingUserState.Completed;
else if (state.HasFailed)
currentState.State = SpectatingUserState.Failed;
else
currentState.State = SpectatingUserState.Quit;
EndPlayingInternal(currentState);
});
}