RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when storyboard attempts to play at main menu

This commit is contained in:
Dean Herbert 2022-09-23 20:10:57 +09:00
parent 2a5556de33
commit 4e9053b099
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
View File

@ -10,7 +10,7 @@
using osu.Framework.Graphics.Animations;
using osu.Framework.Graphics.Textures;
using osu.Framework.Utils;
using osu.Game.Screens.Play;
using osu.Game.Beatmaps;
using osu.Game.Skinning;
using osuTK;
@ -91,6 +91,9 @@ public DrawableStoryboardAnimation(StoryboardAnimation animation)
[Resolved]
private ISkinSource skin { get; set; }
[Resolved]
private IBeatSyncProvider beatSyncProvider { get; set; }
[BackgroundDependencyLoader]
private void load(TextureStore textureStore, Storyboard storyboard)
{
@ -116,9 +119,6 @@ private void load(TextureStore textureStore, Storyboard storyboard)
Animation.ApplyTransforms(this);
}
[Resolved]
private IGameplayClock gameplayClock { get; set; }
protected override void LoadComplete()
{
base.LoadComplete();
@ -128,7 +128,7 @@ protected override void LoadComplete()
//
// In the case of storyboard animations, we want to synchronise with game time perfectly
// so let's get a correct time based on gameplay clock and earliest transform.
PlaybackPosition = gameplayClock.CurrentTime - Animation.EarliestTransformTime;
PlaybackPosition = (beatSyncProvider?.Clock?.CurrentTime ?? Clock.CurrentTime) - Animation.EarliestTransformTime;
}
private void skinSourceChanged()