diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 29be751de2..31a7698f50 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -126,16 +126,16 @@ namespace osu.Game.Beatmaps.Formats
switch (beatmap.BeatmapInfo.RulesetID)
{
case 0:
- parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser();
+ parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
break;
case 1:
- parser = new Rulesets.Objects.Legacy.Taiko.ConvertHitObjectParser();
+ parser = new Rulesets.Objects.Legacy.Taiko.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
break;
case 2:
- parser = new Rulesets.Objects.Legacy.Catch.ConvertHitObjectParser();
+ parser = new Rulesets.Objects.Legacy.Catch.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
break;
case 3:
- parser = new Rulesets.Objects.Legacy.Mania.ConvertHitObjectParser();
+ parser = new Rulesets.Objects.Legacy.Mania.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
break;
}
@@ -405,9 +405,9 @@ namespace osu.Game.Beatmaps.Formats
{
// If the ruleset wasn't specified, assume the osu!standard ruleset.
if (parser == null)
- parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser();
+ parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
- var obj = parser.Parse(line, getOffsetTime());
+ var obj = parser.Parse(line);
if (obj != null)
{
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
index c7451dc978..46be5ff3a5 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
///
public class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
{
+ public ConvertHitObjectParser(double offset, int formatVersion)
+ : base(offset, formatVersion)
+ {
+ }
+
protected override HitObject CreateHit(Vector2 position, bool newCombo)
{
return new ConvertHit
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index c48060bfa9..4919aaea2b 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -19,12 +19,23 @@ namespace osu.Game.Rulesets.Objects.Legacy
///
public abstract class ConvertHitObjectParser : HitObjectParser
{
- public override HitObject Parse(string text)
+ ///
+ /// The offset to apply to all time values.
+ ///
+ public double Offset;
+
+ ///
+ /// The beatmap version.
+ ///
+ public int FormatVersion = LegacyBeatmapDecoder.LATEST_VERSION;
+
+ protected ConvertHitObjectParser(double offset, int formatVersion)
{
- return Parse(text, 0);
+ Offset = offset;
+ formatVersion = formatVersion;
}
- public HitObject Parse(string text, double offset)
+ public override HitObject Parse(string text)
{
try
{
@@ -152,7 +163,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
}
else if (type.HasFlag(ConvertHitObjectType.Spinner))
{
- result = CreateSpinner(new Vector2(512, 384) / 2, Convert.ToDouble(split[5], CultureInfo.InvariantCulture) + offset);
+ result = CreateSpinner(new Vector2(512, 384) / 2, Convert.ToDouble(split[5], CultureInfo.InvariantCulture) + Offset);
if (split.Length > 6)
readCustomSampleBanks(split[6], bankInfo);
@@ -170,13 +181,13 @@ namespace osu.Game.Rulesets.Objects.Legacy
readCustomSampleBanks(string.Join(":", ss.Skip(1)), bankInfo);
}
- result = CreateHold(pos, combo, endTime + offset);
+ result = CreateHold(pos, combo, endTime + Offset);
}
if (result == null)
throw new InvalidOperationException($@"Unknown hit object type {type}.");
- result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture) + offset;
+ result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture) + Offset;
result.Samples = convertSoundType(soundType, bankInfo);
return result;
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
index 99ba1304e8..e4d4fc4687 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
///
public class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
{
+ public ConvertHitObjectParser(double offset, int formatVersion)
+ : base(offset, formatVersion)
+ {
+ }
+
protected override HitObject CreateHit(Vector2 position, bool newCombo)
{
return new ConvertHit
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
index 801e4ea449..ca94234afc 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
///
public class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
{
+ public ConvertHitObjectParser(double offset, int formatVersion)
+ : base(offset, formatVersion)
+ {
+ }
+
protected override HitObject CreateHit(Vector2 position, bool newCombo)
{
return new ConvertHit
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
index 03b1a3187a..20a9134dea 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
///
public class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
{
+ public ConvertHitObjectParser(double offset, int formatVersion)
+ : base(offset, formatVersion)
+ {
+ }
+
protected override HitObject CreateHit(Vector2 position, bool newCombo)
{
return new ConvertHit