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

Don't inherit ReplayPlayer to make results screen work correctly

Browse Source
This commit is contained in:
Dean Herbert
2020-10-28 18:40:06 +09:00
parent 344ff8f4bc
commit 93e3e1a4db
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Play/SpectatorPlayer.cs
View File

@ -11,11 +11,16 @@ using osu.Game.Screens.Ranking;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
public class SpectatorPlayer : ReplayPlayer public class SpectatorPlayer : Player
{ {
private readonly Score score;
protected override bool CheckModsAllowFailure() => false; // todo: better support starting mid-way through beatmap
public SpectatorPlayer(Score score) public SpectatorPlayer(Score score)
: base(score) : base(true, true)
{ {
this.score = score;
} }
protected override ResultsScreen CreateResults(ScoreInfo score) protected override ResultsScreen CreateResults(ScoreInfo score)
@ -32,9 +37,14 @@ namespace osu.Game.Screens.Play
spectatorStreaming.OnUserBeganPlaying += userBeganPlaying; spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
} }
protected override void PrepareReplay()
{
DrawableRuleset?.SetReplayScore(score);
}
private void userBeganPlaying(int userId, SpectatorState state) private void userBeganPlaying(int userId, SpectatorState state)
{ {
if (userId == Score.ScoreInfo.UserID) if (userId == score.ScoreInfo.UserID)
Schedule(this.Exit); Schedule(this.Exit);
} }
@ -49,7 +59,7 @@ namespace osu.Game.Screens.Play
protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
{ {
// if we already have frames, start gameplay at the point in time they exist, should they be too far into the beatmap. // if we already have frames, start gameplay at the point in time they exist, should they be too far into the beatmap.
double? firstFrameTime = Score.Replay.Frames.FirstOrDefault()?.Time; double? firstFrameTime = score.Replay.Frames.FirstOrDefault()?.Time;
if (firstFrameTime == null || firstFrameTime <= gameplayStart + 5000) if (firstFrameTime == null || firstFrameTime <= gameplayStart + 5000)
return base.CreateGameplayClockContainer(beatmap, gameplayStart); return base.CreateGameplayClockContainer(beatmap, gameplayStart);