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

Merge branch 'master' into no-objects-logging

Browse Source
This commit is contained in:
Dean Herbert 2018-08-22 16:42:21 +09:00 committed by GitHub
commit 1c3614d6e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -350,7 +350,8 @@ namespace osu.Game.Beatmaps
{
// let's make sure there are actually .osu files to import.
string mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu"));
if (string.IsNullOrEmpty(mapName)) throw new InvalidOperationException("No beatmap files found in this beatmap archive.");
if (string.IsNullOrEmpty(mapName))
throw new InvalidOperationException($"No beatmap files found in this beatmap archive ({reader.Name}).");
Beatmap beatmap;
using (var stream = new StreamReader(reader.GetStream(mapName)))

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

@ -408,11 +408,8 @@ namespace osu.Game.Beatmaps.Formats
parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
var obj = parser.Parse(line);
if (obj != null)
{
beatmap.HitObjects.Add(obj);
}
}
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;
case LegacyOrigins.BottomRight:
return Anchor.BottomRight;
default:
return Anchor.TopLeft;
}
throw new InvalidDataException($@"Unknown origin: {value}");
}
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.Audio;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Logging;
using osu.Framework.MathUtils;
namespace osu.Game.Rulesets.Objects.Legacy
@ -37,6 +39,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
FormatVersion = formatVersion;
}
[CanBeNull]
public override HitObject Parse(string text)
{
try
@ -191,7 +194,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
}
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.Samples = convertSoundType(soundType, bankInfo);