Revert changes to make HitObject abstract

This commit is contained in:
Dean Herbert
2020-02-25 19:07:15 +09:00
parent 401bf1c928
commit a047456354
12 changed files with 28 additions and 26 deletions

View File

@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Objects
/// HitObjects may contain more properties for which you should be checking through the IHas* types.
/// </para>
/// </summary>
public abstract class HitObject
public class HitObject
{
/// <summary>
/// A small adjustment to the start time of control points to account for rounding/precision errors.
@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Objects
[JsonIgnore]
public IReadOnlyList<HitObject> NestedHitObjects => nestedHitObjects;
protected HitObject()
public HitObject()
{
StartTimeBindable.ValueChanged += time =>
{
@ -147,7 +147,7 @@ namespace osu.Game.Rulesets.Objects
/// Used to decide on drawable object lifetimes.
/// </summary>
[NotNull]
public abstract Judgement CreateJudgement();
public virtual Judgement CreateJudgement() => new Judgement();
/// <summary>
/// Creates the <see cref="HitWindows"/> for this <see cref="HitObject"/>.
@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Objects
/// </para>
/// </summary>
[NotNull]
protected abstract HitWindows CreateHitWindows();
protected virtual HitWindows CreateHitWindows() => new HitWindows();
}
public static class HitObjectExtensions

View File

@ -4,12 +4,12 @@
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Scoring;
namespace osu.Game.Rulesets.Objects
namespace osu.Game.Rulesets.Objects.Legacy
{
/// <summary>
/// A hit object only used for conversion, not actual gameplay.
/// </summary>
public class ConvertHitObject : HitObject
internal abstract class ConvertHitObject : HitObject
{
public override Judgement CreateJudgement() => new IgnoreJudgement();