Actually use whistle sample for sliderwhistle

This commit is contained in:
smoogipoo 2021-04-08 23:13:16 +09:00
parent 7e1739812d
commit 8efa381d3a

View File

@ -111,17 +111,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
base.LoadSamples(); base.LoadSamples();
var firstSample = HitObject.OriginalSamples.FirstOrDefault(); var slidingSamples = new List<ISampleInfo>();
if (firstSample != null) var normalSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
{ if (normalSample != null)
var samples = new List<ISampleInfo> { HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderslide") }; slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(normalSample).With("sliderslide"));
if (HitObject.OriginalSamples.Any(s => s.Name == HitSampleInfo.HIT_WHISTLE)) var whistleSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_WHISTLE);
samples.Add(HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderwhistle")); if (whistleSample != null)
slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(whistleSample).With("sliderwhistle"));
slidingSample.Samples = samples.ToArray(); slidingSample.Samples = slidingSamples.ToArray();
}
} }
public override void StopAllSamples() public override void StopAllSamples()