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

Restore editor clock time after difficulty switch

Browse Source
This commit is contained in:
Bartłomiej Dach
2021-09-11 18:36:57 +02:00
parent 80e54d51f2
commit 3fc72271f1
3 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Edit/Editor.cs
View File

@ -476,6 +476,8 @@ namespace osu.Game.Screens.Edit
});
resetTrack(true);
if (loader?.State != null)
restoreState(loader.State);
}
public override bool OnExiting(IScreen next)
@ -740,7 +742,16 @@ namespace osu.Game.Screens.Edit
return new DifficultyMenuItem(beatmapInfo, isCurrentDifficulty, SwitchToDifficulty);
}
protected void SwitchToDifficulty(BeatmapInfo beatmapInfo) => loader?.ScheduleDifficultySwitch(beatmapInfo);
protected void SwitchToDifficulty(BeatmapInfo nextBeatmap) => loader?.ScheduleDifficultySwitch(nextBeatmap, new EditorState
{
Time = clock.CurrentTimeAccurate
});
private void restoreState([NotNull] EditorState state)
{
if (state.Time != null)
clock.Seek(state.Time.Value);
}
private void cancelExit() => loader?.CancelPendingDifficultySwitch();