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

Make ScrollingPlayfield store a list of SpeedAdjustments instead of a Container.

Browse Source 
Because they're removed from the container when they're not alive, and any further adding methods fail.
This commit is contained in:
smoogipooo
2017-08-09 12:45:50 +09:00
parent dfb47b571a
commit 1c5584f068
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Rulesets/UI/ScrollingPlayfield.cs
View File

@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.UI
/// Hit objects that are to be re-processed on the next update. /// Hit objects that are to be re-processed on the next update.
/// </summary> /// </summary>
private readonly List<DrawableHitObject> queuedHitObjects = new List<DrawableHitObject>(); private readonly List<DrawableHitObject> queuedHitObjects = new List<DrawableHitObject>();
private readonly Container<SpeedAdjustmentContainer> speedAdjustments; private readonly List<SpeedAdjustmentContainer> speedAdjustments = new List<SpeedAdjustmentContainer>();
private readonly Axes scrollingAxes; private readonly Axes scrollingAxes;
@ -179,8 +179,6 @@ namespace osu.Game.Rulesets.UI
public ScrollingHitObjectContainer(Axes scrollingAxes) public ScrollingHitObjectContainer(Axes scrollingAxes)
{ {
this.scrollingAxes = scrollingAxes; this.scrollingAxes = scrollingAxes;
AddInternal(speedAdjustments = new Container<SpeedAdjustmentContainer> { RelativeSizeAxes = Axes.Both });
} }
/// <summary> /// <summary>
@ -193,6 +191,8 @@ namespace osu.Game.Rulesets.UI
speedAdjustment.ScrollingAxes = scrollingAxes; speedAdjustment.ScrollingAxes = scrollingAxes;
speedAdjustment.Reversed = Reversed; speedAdjustment.Reversed = Reversed;
speedAdjustments.Add(speedAdjustment); speedAdjustments.Add(speedAdjustment);
AddInternal(speedAdjustment);
} }
public override IEnumerable<DrawableHitObject> Objects => speedAdjustments.SelectMany(s => s.Children); public override IEnumerable<DrawableHitObject> Objects => speedAdjustments.SelectMany(s => s.Children);