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

Merge branch 'master' into more-import-logging

Browse Source
This commit is contained in:
Dean Herbert 2018-08-22 16:30:55 +09:00 committed by GitHub
commit 985528d08b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,12 +408,9 @@ namespace osu.Game.Beatmaps.Formats
parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion); parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
var obj = parser.Parse(line); var obj = parser.Parse(line);
if (obj != null) if (obj != null)
{
beatmap.HitObjects.Add(obj); beatmap.HitObjects.Add(obj);
} }
}
private int getOffsetTime(int time) => time + (ApplyOffsets ? offset : 0); private int getOffsetTime(int time) => time + (ApplyOffsets ? offset : 0);

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

@ -269,9 +269,9 @@ namespace osu.Game.Beatmaps.Formats
return Anchor.BottomCentre; return Anchor.BottomCentre;
case LegacyOrigins.BottomRight: case LegacyOrigins.BottomRight:
return Anchor.BottomRight; return Anchor.BottomRight;
default:
return Anchor.TopLeft;
} }
throw new InvalidDataException($@"Unknown origin: {value}");
} }
private void handleVariables(string line) private void handleVariables(string line)

8
osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
View File

@ -10,6 +10,8 @@ using System.IO;
using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.Formats;
using osu.Game.Audio; using osu.Game.Audio;
using System.Linq; using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Logging;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
namespace osu.Game.Rulesets.Objects.Legacy namespace osu.Game.Rulesets.Objects.Legacy
@ -37,6 +39,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
FormatVersion = formatVersion; FormatVersion = formatVersion;
} }
[CanBeNull]
public override HitObject Parse(string text) public override HitObject Parse(string text)
{ {
try try
@ -191,7 +194,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
} }
if (result == null) if (result == null)
throw new InvalidOperationException($@"Unknown hit object type {type}."); {
Logger.Log($"Unknown hit object type: {type}. Skipped.", level: LogLevel.Error);
return null;
}
result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture) + Offset; result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture) + Offset;
result.Samples = convertSoundType(soundType, bankInfo); result.Samples = convertSoundType(soundType, bankInfo);