1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-18 23:57:22 +08:00

Merge pull request #10770 from cadon0/fix-storyboard-sprite-paths

Fix crashes if animation sprite path does not match a file
This commit is contained in:
Bartłomiej Dach 2020-11-10 13:32:19 +01:00 committed by GitHub
commit 8788ef74aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -115,11 +115,11 @@ namespace osu.Game.Storyboards.Drawables
[BackgroundDependencyLoader]
private void load(TextureStore textureStore, Storyboard storyboard)
{
for (int frame = 0; frame < Animation.FrameCount; frame++)
for (int frameIndex = 0; frameIndex < Animation.FrameCount; frameIndex++)
{
string framePath = Animation.Path.Replace(".", frame + ".");
AddFrame(storyboard.CreateSpriteFromResourcePath(framePath, textureStore), Animation.FrameDelay);
string framePath = Animation.Path.Replace(".", frameIndex + ".");
Drawable frame = storyboard.CreateSpriteFromResourcePath(framePath, textureStore) ?? Empty();
AddFrame(frame, Animation.FrameDelay);
}
Animation.ApplyTransforms(this);