sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-relax-mod

Browse Source
This commit is contained in:
Salman Ahmed
2019-06-30 21:20:41 +03:00
committed by GitHub
parent 4465e42b85 43d83b35d0
commit 46625e827d
47 changed files with 425 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
protected SkinnableSound Samples;
protected virtual IEnumerable<SampleInfo> GetSamples() => HitObject.Samples;
protected virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
private readonly Lazy<List<DrawableHitObject>> nestedHitObjects = new Lazy<List<DrawableHitObject>>();
public IEnumerable<DrawableHitObject> NestedHitObjects => nestedHitObjects.IsValueCreated ? nestedHitObjects.Value : Enumerable.Empty<DrawableHitObject>();
@ -77,10 +77,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
private bool judgementOccurred;
public bool Interactive = true;
public override bool HandleNonPositionalInput => Interactive;
public override bool HandlePositionalInput => Interactive;
public override bool RemoveWhenNotAlive => false;
public override bool RemoveCompletedTransforms => false;
protected override bool RequiresChildrenUpdate => true;
@ -110,7 +106,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
var samples = GetSamples().ToArray();
if (samples.Any())
if (samples.Length > 0)
{
if (HitObject.SampleControlPoint == null)
throw new ArgumentNullException(nameof(HitObject.SampleControlPoint), $"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."