1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 06:03:22 +08:00

Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects.

This commit is contained in:
smoogipooo 2017-04-22 21:33:11 +09:00
parent 99db871e6c
commit 2af9bf1423
22 changed files with 65 additions and 65 deletions

View File

@ -29,7 +29,7 @@ namespace osu.Game.Beatmaps.Formats
// TODO: Not sure how far back to go, or differences between versions // TODO: Not sure how far back to go, or differences between versions
} }
private HitObjectParser parser; private ConvertHitObjectParser parser;
private LegacySampleBank defaultSampleBank; private LegacySampleBank defaultSampleBank;
private int defaultSampleVolume = 100; private int defaultSampleVolume = 100;
@ -90,16 +90,16 @@ namespace osu.Game.Beatmaps.Formats
switch (beatmap.BeatmapInfo.RulesetID) switch (beatmap.BeatmapInfo.RulesetID)
{ {
case 0: case 0:
parser = new Rulesets.Objects.Legacy.Osu.HitObjectParser(); parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser();
break; break;
case 1: case 1:
parser = new Rulesets.Objects.Legacy.Taiko.HitObjectParser(); parser = new Rulesets.Objects.Legacy.Taiko.ConvertHitObjectParser();
break; break;
case 2: case 2:
parser = new Rulesets.Objects.Legacy.Catch.HitObjectParser(); parser = new Rulesets.Objects.Legacy.Catch.ConvertHitObjectParser();
break; break;
case 3: case 3:
parser = new Rulesets.Objects.Legacy.Mania.HitObjectParser(); parser = new Rulesets.Objects.Legacy.Mania.ConvertHitObjectParser();
break; break;
} }
break; break;

View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
/// <summary> /// <summary>
/// Legacy osu!catch Hit-type, used for parsing Beatmaps. /// Legacy osu!catch Hit-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Hit : HitObject, IHasCombo, IHasXPosition internal sealed class ConvertHit : HitObject, IHasCombo, IHasXPosition
{ {
public float X { get; set; } public float X { get; set; }

View File

@ -11,11 +11,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
/// <summary> /// <summary>
/// A HitObjectParser to parse legacy osu!catch Beatmaps. /// A HitObjectParser to parse legacy osu!catch Beatmaps.
/// </summary> /// </summary>
internal class HitObjectParser : Legacy.HitObjectParser internal class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
{ {
protected override HitObject CreateHit(Vector2 position, bool newCombo) protected override HitObject CreateHit(Vector2 position, bool newCombo)
{ {
return new Hit return new ConvertHit
{ {
X = position.X, X = position.X,
NewCombo = newCombo, NewCombo = newCombo,
@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples) protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
{ {
return new Slider return new ConvertSlider
{ {
X = position.X, X = position.X,
NewCombo = newCombo, NewCombo = newCombo,
@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
protected override HitObject CreateSpinner(Vector2 position, double endTime) protected override HitObject CreateSpinner(Vector2 position, double endTime)
{ {
return new Spinner return new ConvertSpinner
{ {
EndTime = endTime EndTime = endTime
}; };

View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
/// <summary> /// <summary>
/// Legacy osu!catch Slider-type, used for parsing Beatmaps. /// Legacy osu!catch Slider-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Slider : LegacySlider, IHasXPosition, IHasCombo internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasXPosition, IHasCombo
{ {
public float X { get; set; } public float X { get; set; }

View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
/// <summary> /// <summary>
/// Legacy osu!catch Spinner-type, used for parsing Beatmaps. /// Legacy osu!catch Spinner-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Spinner : HitObject, IHasEndTime internal sealed class ConvertSpinner : HitObject, IHasEndTime
{ {
public double EndTime { get; set; } public double EndTime { get; set; }

View File

@ -14,28 +14,28 @@ namespace osu.Game.Rulesets.Objects.Legacy
/// <summary> /// <summary>
/// A HitObjectParser to parse legacy Beatmaps. /// A HitObjectParser to parse legacy Beatmaps.
/// </summary> /// </summary>
internal abstract class HitObjectParser : Objects.HitObjectParser internal abstract class ConvertHitObjectParser : Objects.HitObjectParser
{ {
public override HitObject Parse(string text) public override HitObject Parse(string text)
{ {
string[] split = text.Split(','); string[] split = text.Split(',');
HitObjectType type = (HitObjectType)int.Parse(split[3]) & ~HitObjectType.ColourHax; ConvertHitObjectType type = (ConvertHitObjectType)int.Parse(split[3]) & ~ConvertHitObjectType.ColourHax;
bool combo = type.HasFlag(HitObjectType.NewCombo); bool combo = type.HasFlag(ConvertHitObjectType.NewCombo);
type &= ~HitObjectType.NewCombo; type &= ~ConvertHitObjectType.NewCombo;
var soundType = (LegacySoundType)int.Parse(split[4]); var soundType = (LegacySoundType)int.Parse(split[4]);
var bankInfo = new SampleBankInfo(); var bankInfo = new SampleBankInfo();
HitObject result; HitObject result;
if ((type & HitObjectType.Circle) > 0) if ((type & ConvertHitObjectType.Circle) > 0)
{ {
result = CreateHit(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo); result = CreateHit(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo);
if (split.Length > 5) if (split.Length > 5)
readCustomSampleBanks(split[5], bankInfo); readCustomSampleBanks(split[5], bankInfo);
} }
else if ((type & HitObjectType.Slider) > 0) else if ((type & ConvertHitObjectType.Slider) > 0)
{ {
CurveType curveType = CurveType.Catmull; CurveType curveType = CurveType.Catmull;
double length = 0; double length = 0;
@ -129,21 +129,21 @@ namespace osu.Game.Rulesets.Objects.Legacy
result = CreateSlider(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo, points, length, curveType, repeatCount, nodeSamples); result = CreateSlider(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo, points, length, curveType, repeatCount, nodeSamples);
} }
else if ((type & HitObjectType.Spinner) > 0) else if ((type & ConvertHitObjectType.Spinner) > 0)
{ {
result = CreateSpinner(new Vector2(512, 384) / 2, Convert.ToDouble(split[5], CultureInfo.InvariantCulture)); result = CreateSpinner(new Vector2(512, 384) / 2, Convert.ToDouble(split[5], CultureInfo.InvariantCulture));
if (split.Length > 6) if (split.Length > 6)
readCustomSampleBanks(split[6], bankInfo); readCustomSampleBanks(split[6], bankInfo);
} }
else if ((type & HitObjectType.Hold) > 0) else if ((type & ConvertHitObjectType.Hold) > 0)
{ {
// Note: Hold is generated by BMS converts // Note: Hold is generated by BMS converts
// Todo: Apparently end time is determined by samples?? // Todo: Apparently end time is determined by samples??
// Shouldn't need implementation until mania // Shouldn't need implementation until mania
result = new Hold result = new ConvertHold
{ {
Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])), Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])),
NewCombo = combo NewCombo = combo

View File

@ -6,7 +6,7 @@ using System;
namespace osu.Game.Rulesets.Objects.Legacy namespace osu.Game.Rulesets.Objects.Legacy
{ {
[Flags] [Flags]
public enum HitObjectType internal enum ConvertHitObjectType
{ {
Circle = 1 << 0, Circle = 1 << 0,
Slider = 1 << 1, Slider = 1 << 1,

View File

@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
/// <summary> /// <summary>
/// Legacy Hold-type, used for parsing "specials" in beatmaps. /// Legacy Hold-type, used for parsing "specials" in beatmaps.
/// </summary> /// </summary>
internal sealed class Hold : HitObject, IHasPosition, IHasCombo, IHasHold internal sealed class ConvertHold : HitObject, IHasPosition, IHasCombo, IHasHold
{ {
public Vector2 Position { get; set; } public Vector2 Position { get; set; }

View File

@ -9,7 +9,7 @@ using osu.Game.Audio;
namespace osu.Game.Rulesets.Objects.Legacy namespace osu.Game.Rulesets.Objects.Legacy
{ {
internal class LegacySlider : HitObject, IHasCurve internal abstract class ConvertSlider : HitObject, IHasCurve
{ {
public List<Vector2> ControlPoints { get; set; } public List<Vector2> ControlPoints { get; set; }
public CurveType CurveType { get; set; } public CurveType CurveType { get; set; }

View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
/// <summary> /// <summary>
/// Legacy osu!mania Hit-type, used for parsing Beatmaps. /// Legacy osu!mania Hit-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Hit : HitObject, IHasXPosition, IHasCombo internal sealed class ConvertHit : HitObject, IHasXPosition, IHasCombo
{ {
public float X { get; set; } public float X { get; set; }

View File

@ -11,11 +11,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
/// <summary> /// <summary>
/// A HitObjectParser to parse legacy osu!mania Beatmaps. /// A HitObjectParser to parse legacy osu!mania Beatmaps.
/// </summary> /// </summary>
internal class HitObjectParser : Legacy.HitObjectParser internal class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
{ {
protected override HitObject CreateHit(Vector2 position, bool newCombo) protected override HitObject CreateHit(Vector2 position, bool newCombo)
{ {
return new Hit return new ConvertHit
{ {
X = position.X, X = position.X,
NewCombo = newCombo, NewCombo = newCombo,
@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples) protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
{ {
return new Slider return new ConvertSlider
{ {
X = position.X, X = position.X,
NewCombo = newCombo, NewCombo = newCombo,
@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
protected override HitObject CreateSpinner(Vector2 position, double endTime) protected override HitObject CreateSpinner(Vector2 position, double endTime)
{ {
return new Spinner return new ConvertSpinner
{ {
X = position.X, X = position.X,
EndTime = endTime EndTime = endTime

View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
/// <summary> /// <summary>
/// Legacy osu!mania Slider-type, used for parsing Beatmaps. /// Legacy osu!mania Slider-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Slider : LegacySlider, IHasXPosition, IHasCombo internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasXPosition, IHasCombo
{ {
public float X { get; set; } public float X { get; set; }

View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
/// <summary> /// <summary>
/// Legacy osu!mania Spinner-type, used for parsing Beatmaps. /// Legacy osu!mania Spinner-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Spinner : HitObject, IHasEndTime, IHasXPosition internal sealed class ConvertSpinner : HitObject, IHasEndTime, IHasXPosition
{ {
public double EndTime { get; set; } public double EndTime { get; set; }

View File

@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
/// <summary> /// <summary>
/// Legacy osu! Hit-type, used for parsing Beatmaps. /// Legacy osu! Hit-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Hit : HitObject, IHasPosition, IHasCombo internal sealed class ConvertHit : HitObject, IHasPosition, IHasCombo
{ {
public Vector2 Position { get; set; } public Vector2 Position { get; set; }

View File

@ -11,11 +11,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
/// <summary> /// <summary>
/// A HitObjectParser to parse legacy osu! Beatmaps. /// A HitObjectParser to parse legacy osu! Beatmaps.
/// </summary> /// </summary>
internal class HitObjectParser : Legacy.HitObjectParser internal class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
{ {
protected override HitObject CreateHit(Vector2 position, bool newCombo) protected override HitObject CreateHit(Vector2 position, bool newCombo)
{ {
return new Hit return new ConvertHit
{ {
Position = position, Position = position,
NewCombo = newCombo, NewCombo = newCombo,
@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples) protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
{ {
return new Slider return new ConvertSlider
{ {
Position = position, Position = position,
NewCombo = newCombo, NewCombo = newCombo,
@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
protected override HitObject CreateSpinner(Vector2 position, double endTime) protected override HitObject CreateSpinner(Vector2 position, double endTime)
{ {
return new Spinner return new ConvertSpinner
{ {
Position = position, Position = position,
EndTime = endTime EndTime = endTime

View File

@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
/// <summary> /// <summary>
/// Legacy osu! Slider-type, used for parsing Beatmaps. /// Legacy osu! Slider-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Slider : LegacySlider, IHasPosition, IHasCombo internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo
{ {
public Vector2 Position { get; set; } public Vector2 Position { get; set; }

View File

@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
/// <summary> /// <summary>
/// Legacy osu! Spinner-type, used for parsing Beatmaps. /// Legacy osu! Spinner-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Spinner : HitObject, IHasEndTime, IHasPosition internal sealed class ConvertSpinner : HitObject, IHasEndTime, IHasPosition
{ {
public double EndTime { get; set; } public double EndTime { get; set; }

View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
/// <summary> /// <summary>
/// Legacy osu!taiko Hit-type, used for parsing Beatmaps. /// Legacy osu!taiko Hit-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Hit : HitObject, IHasCombo internal sealed class ConvertHit : HitObject, IHasCombo
{ {
public bool NewCombo { get; set; } public bool NewCombo { get; set; }
} }

View File

@ -11,11 +11,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
/// <summary> /// <summary>
/// A HitObjectParser to parse legacy osu!taiko Beatmaps. /// A HitObjectParser to parse legacy osu!taiko Beatmaps.
/// </summary> /// </summary>
internal class HitObjectParser : Legacy.HitObjectParser internal class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
{ {
protected override HitObject CreateHit(Vector2 position, bool newCombo) protected override HitObject CreateHit(Vector2 position, bool newCombo)
{ {
return new Hit return new ConvertHit
{ {
NewCombo = newCombo, NewCombo = newCombo,
}; };
@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples) protected override HitObject CreateSlider(Vector2 position, bool newCombo, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> repeatSamples)
{ {
return new Slider return new ConvertSlider
{ {
NewCombo = newCombo, NewCombo = newCombo,
ControlPoints = controlPoints, ControlPoints = controlPoints,
@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
protected override HitObject CreateSpinner(Vector2 position, double endTime) protected override HitObject CreateSpinner(Vector2 position, double endTime)
{ {
return new Spinner return new ConvertSpinner
{ {
EndTime = endTime EndTime = endTime
}; };

View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
/// <summary> /// <summary>
/// Legacy osu!taiko Slider-type, used for parsing Beatmaps. /// Legacy osu!taiko Slider-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Slider : LegacySlider, IHasCombo internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasCombo
{ {
public bool NewCombo { get; set; } public bool NewCombo { get; set; }
} }

View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
/// <summary> /// <summary>
/// Legacy osu!taiko Spinner-type, used for parsing Beatmaps. /// Legacy osu!taiko Spinner-type, used for parsing Beatmaps.
/// </summary> /// </summary>
internal sealed class Spinner : HitObject, IHasEndTime internal sealed class ConvertSpinner : HitObject, IHasEndTime
{ {
public double EndTime { get; set; } public double EndTime { get; set; }

View File

@ -109,20 +109,20 @@
<Compile Include="IO\Serialization\IJsonSerializable.cs" /> <Compile Include="IO\Serialization\IJsonSerializable.cs" />
<Compile Include="IPC\ScoreIPCChannel.cs" /> <Compile Include="IPC\ScoreIPCChannel.cs" />
<Compile Include="Rulesets\BeatmapStatistic.cs" /> <Compile Include="Rulesets\BeatmapStatistic.cs" />
<Compile Include="Rulesets\Objects\Legacy\Catch\Hit.cs" /> <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHit.cs" />
<Compile Include="Rulesets\Objects\Legacy\Catch\HitObjectParser.cs" /> <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHitObjectParser.cs" />
<Compile Include="Rulesets\Objects\Legacy\Catch\Slider.cs" /> <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertSlider.cs" />
<Compile Include="Rulesets\Objects\Legacy\Catch\Spinner.cs" /> <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertSpinner.cs" />
<Compile Include="Rulesets\Objects\Legacy\LegacySlider.cs" /> <Compile Include="Rulesets\Objects\Legacy\ConvertSlider.cs" />
<Compile Include="Rulesets\Objects\Legacy\Mania\Hit.cs" /> <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertHit.cs" />
<Compile Include="Rulesets\Objects\Legacy\Mania\HitObjectParser.cs" /> <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertHitObjectParser.cs" />
<Compile Include="Rulesets\Objects\Legacy\Mania\Slider.cs" /> <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertSlider.cs" />
<Compile Include="Rulesets\Objects\Legacy\Mania\Spinner.cs" /> <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertSpinner.cs" />
<Compile Include="Rulesets\Objects\Legacy\Osu\HitObjectParser.cs" /> <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertHitObjectParser.cs" />
<Compile Include="Rulesets\Objects\Legacy\Taiko\Hit.cs" /> <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertHit.cs" />
<Compile Include="Rulesets\Objects\Legacy\Taiko\HitObjectParser.cs" /> <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertHitObjectParser.cs" />
<Compile Include="Rulesets\Objects\Legacy\Taiko\Slider.cs" /> <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertSlider.cs" />
<Compile Include="Rulesets\Objects\Legacy\Taiko\Spinner.cs" /> <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertSpinner.cs" />
<Compile Include="Rulesets\Objects\Types\IHasXPosition.cs" /> <Compile Include="Rulesets\Objects\Types\IHasXPosition.cs" />
<Compile Include="Rulesets\Objects\Types\IHasYPosition.cs" /> <Compile Include="Rulesets\Objects\Types\IHasYPosition.cs" />
<Compile Include="Rulesets\Replays\Replay.cs" /> <Compile Include="Rulesets\Replays\Replay.cs" />
@ -135,11 +135,11 @@
<Compile Include="Rulesets\Objects\Drawables\HitResult.cs" /> <Compile Include="Rulesets\Objects\Drawables\HitResult.cs" />
<Compile Include="Rulesets\Objects\BezierApproximator.cs" /> <Compile Include="Rulesets\Objects\BezierApproximator.cs" />
<Compile Include="Rulesets\Objects\CircularArcApproximator.cs" /> <Compile Include="Rulesets\Objects\CircularArcApproximator.cs" />
<Compile Include="Rulesets\Objects\Legacy\Osu\Hit.cs" /> <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertHit.cs" />
<Compile Include="Rulesets\Objects\Legacy\HitObjectParser.cs" /> <Compile Include="Rulesets\Objects\Legacy\ConvertHitObjectParser.cs" />
<Compile Include="Rulesets\Objects\Legacy\Hold.cs" /> <Compile Include="Rulesets\Objects\Legacy\ConvertHold.cs" />
<Compile Include="Rulesets\Objects\Legacy\Osu\Slider.cs" /> <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertSlider.cs" />
<Compile Include="Rulesets\Objects\Legacy\Osu\Spinner.cs" /> <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertSpinner.cs" />
<Compile Include="Rulesets\Objects\SliderCurve.cs" /> <Compile Include="Rulesets\Objects\SliderCurve.cs" />
<Compile Include="Rulesets\Objects\Types\CurveType.cs" /> <Compile Include="Rulesets\Objects\Types\CurveType.cs" />
<Compile Include="Rulesets\Objects\Drawables\IDrawableHitObjectWithProxiedApproach.cs" /> <Compile Include="Rulesets\Objects\Drawables\IDrawableHitObjectWithProxiedApproach.cs" />
@ -152,7 +152,7 @@
<Compile Include="Rulesets\Objects\Types\IHasRepeats.cs" /> <Compile Include="Rulesets\Objects\Types\IHasRepeats.cs" />
<Compile Include="Rulesets\Objects\Types\IHasPosition.cs" /> <Compile Include="Rulesets\Objects\Types\IHasPosition.cs" />
<Compile Include="Rulesets\Objects\Types\IHasHold.cs" /> <Compile Include="Rulesets\Objects\Types\IHasHold.cs" />
<Compile Include="Rulesets\Objects\Legacy\HitObjectType.cs" /> <Compile Include="Rulesets\Objects\Legacy\ConvertHitObjectType.cs" />
<Compile Include="Rulesets\Replays\ReplayButtonState.cs" /> <Compile Include="Rulesets\Replays\ReplayButtonState.cs" />
<Compile Include="Rulesets\Replays\ReplayFrame.cs" /> <Compile Include="Rulesets\Replays\ReplayFrame.cs" />
<Compile Include="Database\RulesetDatabase.cs" /> <Compile Include="Database\RulesetDatabase.cs" />