h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 19:27:24 +08:00
Code Issues Releases Wiki Activity

Only trim trailing spaces to avoid breakage in storyboard parsing

Browse Source
This commit is contained in:
Dean Herbert 2021-03-18 16:30:30 +09:00
parent bb3c3f302a
commit 5b0d75ee56
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@ -67,16 +67,14 @@ namespace osu.Game.Beatmaps.Formats
protected override void ParseLine(Beatmap beatmap, Section section, string line) protected override void ParseLine(Beatmap beatmap, Section section, string line)
{ {
var strippedLine = StripComments(line);
switch (section) switch (section)
{ {
case Section.General: case Section.General:
handleGeneral(strippedLine); handleGeneral(line);
return; return;
case Section.Editor: case Section.Editor:
handleEditor(strippedLine); handleEditor(line);
return; return;
case Section.Metadata: case Section.Metadata:
@ -84,19 +82,19 @@ namespace osu.Game.Beatmaps.Formats
return; return;
case Section.Difficulty: case Section.Difficulty:
handleDifficulty(strippedLine); handleDifficulty(line);
return; return;
case Section.Events: case Section.Events:
handleEvent(strippedLine); handleEvent(line);
return; return;
case Section.TimingPoints: case Section.TimingPoints:
handleTimingPoint(strippedLine); handleTimingPoint(line);
return; return;
case Section.HitObjects: case Section.HitObjects:
handleHitObject(strippedLine); handleHitObject(line);
return; return;
} }

4
osu.Game/Beatmaps/Formats/LegacyDecoder.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Beatmaps.Formats
if (ShouldSkipLine(line)) if (ShouldSkipLine(line))
continue; continue;
line = line.Trim(); line = StripComments(line).TrimEnd();
if (line.StartsWith('[') && line.EndsWith(']')) if (line.StartsWith('[') && line.EndsWith(']'))
{ {
@ -73,8 +73,6 @@ namespace osu.Game.Beatmaps.Formats
protected virtual void ParseLine(T output, Section section, string line) protected virtual void ParseLine(T output, Section section, string line)
{ {
line = StripComments(line);
switch (section) switch (section)
{ {
case Section.Colours: case Section.Colours:

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

@ -45,8 +45,6 @@ namespace osu.Game.Beatmaps.Formats
protected override void ParseLine(Storyboard storyboard, Section section, string line) protected override void ParseLine(Storyboard storyboard, Section section, string line)
{ {
line = StripComments(line);
switch (section) switch (section)
{ {
case Section.General: case Section.General:

2
osu.Game/Skinning/LegacyManiaSkinDecoder.cs
View File

@ -31,8 +31,6 @@ namespace osu.Game.Skinning
protected override void ParseLine(List<LegacyManiaSkinConfiguration> output, Section section, string line) protected override void ParseLine(List<LegacyManiaSkinConfiguration> output, Section section, string line)
{ {
line = StripComments(line);
switch (section) switch (section)
{ {
case Section.Mania: case Section.Mania: