RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Actually use whistle sample for sliderwhistle

This commit is contained in:
smoogipoo 2021-04-08 23:13:16 +09:00
parent 7e1739812d
commit 8efa381d3a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

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