From 6bfb716cc64fa8d84ee4c4933c6437bbe7f34eec Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Fri, 16 Jun 2017 10:56:33 +0900 Subject: [PATCH] CI fixes. Update SpeedAdjustmentCollection.cs --- osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs | 7 +++++-- osu.Game/Rulesets/UI/SpeedAdjustedHitRenderer.cs | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs b/osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs index 5e1a23ef93..9fb0c582d7 100644 --- a/osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs +++ b/osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs @@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Timing protected override IComparer DepthComparer => new SpeedAdjustmentContainerReverseStartTimeComparer(); /// - /// Hit objects that are to be re-processed when is invalidated. + /// Hit objects that are to be re-processed on the next update. /// private readonly Queue queuedHitObjects = new Queue(); @@ -60,6 +60,9 @@ namespace osu.Game.Rulesets.Timing { base.Update(); + // Todo: At the moment this is going to re-process every single Update, however this will only be a null-op + // when there are no SpeedAdjustmentContainers available. This should probably error or something, but it's okay for now. + // An external count is kept because hit objects that can't be added are re-queued int count = queuedHitObjects.Count; while (count-- > 0) @@ -121,4 +124,4 @@ namespace osu.Game.Rulesets.Timing } } } -} \ No newline at end of file +} diff --git a/osu.Game/Rulesets/UI/SpeedAdjustedHitRenderer.cs b/osu.Game/Rulesets/UI/SpeedAdjustedHitRenderer.cs index 05e79f6d7e..42dadb047d 100644 --- a/osu.Game/Rulesets/UI/SpeedAdjustedHitRenderer.cs +++ b/osu.Game/Rulesets/UI/SpeedAdjustedHitRenderer.cs @@ -1,3 +1,6 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + using System.Collections.Generic; using System.Linq; using osu.Framework.Allocation; @@ -98,4 +101,4 @@ namespace osu.Game.Rulesets.UI /// protected abstract void ApplySpeedAdjustments(); } -} \ No newline at end of file +}