sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-22 19:00:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove default allowRetry parameter value from ResultsScreen

Browse Source
This commit is contained in:
Dean Herbert
2020-11-20 14:35:44 +09:00
parent 229aed1d46
commit 2db42f8e67
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
View File

@ -326,7 +326,7 @@ namespace osu.Game.Tests.Visual.Ranking
public HotkeyRetryOverlay RetryOverlay; public HotkeyRetryOverlay RetryOverlay;
public UnrankedSoloResultsScreen(ScoreInfo score) public UnrankedSoloResultsScreen(ScoreInfo score)
: base(score) : base(score, false)
{ {
Score.Beatmap.OnlineBeatmapID = 0; Score.Beatmap.OnlineBeatmapID = 0;
Score.Beatmap.Status = BeatmapSetOnlineStatus.Pending; Score.Beatmap.Status = BeatmapSetOnlineStatus.Pending;

2
osu.Game/OsuGame.cs
View File

@ -420,7 +420,7 @@ namespace osu.Game
break; break;
case ScorePresentType.Results: case ScorePresentType.Results:
screen.Push(new SoloResultsScreen(databasedScore.ScoreInfo)); screen.Push(new SoloResultsScreen(databasedScore.ScoreInfo, false));
break; break;
} }
}, validScreens: new[] { typeof(PlaySongSelect) }); }, validScreens: new[] { typeof(PlaySongSelect) });

2
osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
View File

@ -92,7 +92,7 @@ namespace osu.Game.Screens.Multi.Play
protected override ResultsScreen CreateResults(ScoreInfo score) protected override ResultsScreen CreateResults(ScoreInfo score)
{ {
Debug.Assert(roomId.Value != null); Debug.Assert(roomId.Value != null);
return new TimeshiftResultsScreen(score, roomId.Value.Value, playlistItem); return new TimeshiftResultsScreen(score, roomId.Value.Value, playlistItem, true);
} }
protected override ScoreInfo CreateScore() protected override ScoreInfo CreateScore()

2
osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Ranking
[Resolved] [Resolved]
private IAPIProvider api { get; set; } private IAPIProvider api { get; set; }
public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry = true) public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry)
: base(score, allowRetry) : base(score, allowRetry)
{ {
this.roomId = roomId; this.roomId = roomId;

2
osu.Game/Screens/Play/Player.cs
View File

@ -545,7 +545,7 @@ namespace osu.Game.Screens.Play
protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value; protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score); protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
#region Fail Logic #region Fail Logic

2
osu.Game/Screens/Play/SpectatorResultsScreen.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play
public class SpectatorResultsScreen : SoloResultsScreen public class SpectatorResultsScreen : SoloResultsScreen
{ {
public SpectatorResultsScreen(ScoreInfo score) public SpectatorResultsScreen(ScoreInfo score)
: base(score) : base(score, false)
{ {
} }

2
osu.Game/Screens/Ranking/SoloResultsScreen.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Screens.Ranking
[Resolved] [Resolved]
private RulesetStore rulesets { get; set; } private RulesetStore rulesets { get; set; }
public SoloResultsScreen(ScoreInfo score, bool allowRetry = true) public SoloResultsScreen(ScoreInfo score, bool allowRetry)
: base(score, allowRetry) : base(score, allowRetry)
{ {
} }

2
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Screens.Select
} }
protected void PresentScore(ScoreInfo score) => protected void PresentScore(ScoreInfo score) =>
FinaliseSelection(score.Beatmap, score.Ruleset, () => this.Push(new SoloResultsScreen(score))); FinaliseSelection(score.Beatmap, score.Ruleset, () => this.Push(new SoloResultsScreen(score, false)));
protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea(); protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();