h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:42:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #4484 from nyquillerium/storyboard-clock

Browse Source 
Fix storyboards not having the correct gameplay clock
This commit is contained in:
Dean Herbert 2019-03-18 21:26:37 +09:00 committed by GitHub
commit 4031cad4f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Game.IO; using osu.Game.IO;
using osu.Game.Screens.Play;
namespace osu.Game.Storyboards.Drawables namespace osu.Game.Storyboards.Drawables
{ {
@ -55,9 +56,12 @@ namespace osu.Game.Storyboards.Drawables
}); });
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader(true)]
private void load(FileStore fileStore) private void load(FileStore fileStore, GameplayClock clock)
{ {
if (clock != null)
Clock = clock;
dependencies.Cache(new TextureStore(new TextureLoaderStore(fileStore.Store), false, scaleAdjust: 1)); dependencies.Cache(new TextureStore(new TextureLoaderStore(fileStore.Store), false, scaleAdjust: 1));
foreach (var layer in Storyboard.Layers) foreach (var layer in Storyboard.Layers)