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

Merge branch 'master' into ruleset-configs

Browse Source
This commit is contained in:
Dean Herbert 2018-01-24 17:45:47 +09:00 committed by GitHub
commit aa913f6de5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
View File

@ -70,7 +70,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
Assert.AreEqual(new Vector2(320, 240), sprite.InitialPosition); Assert.AreEqual(new Vector2(320, 240), sprite.InitialPosition);
Assert.IsTrue(sprite.IsDrawable); Assert.IsTrue(sprite.IsDrawable);
Assert.AreEqual(Anchor.Centre, sprite.Origin); Assert.AreEqual(Anchor.Centre, sprite.Origin);
Assert.AreEqual(Path.Combine("SB", "lyric", "ja-21.png"), sprite.Path); Assert.AreEqual("SB/lyric/ja-21.png", sprite.Path);
var animation = background.Elements.ElementAt(12) as StoryboardAnimation; var animation = background.Elements.ElementAt(12) as StoryboardAnimation;
Assert.NotNull(animation); Assert.NotNull(animation);
@ -82,7 +82,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
Assert.IsTrue(animation.IsDrawable); Assert.IsTrue(animation.IsDrawable);
Assert.AreEqual(AnimationLoopType.LoopForever, animation.LoopType); Assert.AreEqual(AnimationLoopType.LoopForever, animation.LoopType);
Assert.AreEqual(Anchor.Centre, animation.Origin); Assert.AreEqual(Anchor.Centre, animation.Origin);
Assert.AreEqual(Path.Combine("SB", "red jitter", "red_0000.jpg"), animation.Path); Assert.AreEqual("SB/red jitter/red_0000.jpg", animation.Path);
Assert.AreEqual(78993, animation.StartTime); Assert.AreEqual(78993, animation.StartTime);
} }
} }

2
osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
View File

@ -301,6 +301,6 @@ namespace osu.Game.Beatmaps.Formats
} }
} }
private string cleanFilename(string path) => FileSafety.PathSanitise(path.Trim('\"')); private string cleanFilename(string path) => FileSafety.PathStandardise(FileSafety.PathSanitise(path.Trim('\"')));
} }
} }