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

Make track not-null in GameplayClockContainer/FailAnimation

This commit is contained in:
smoogipoo 2020-08-12 00:50:56 +09:00
parent b66f303e71
commit eec94e1f53
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Play/FailAnimation.cs
View File

@ -6,6 +6,7 @@
using osu.Game.Rulesets.UI;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using osu.Framework.Allocation;
using osu.Framework.Audio.Sample;
using osu.Framework.Audio.Track;
@ -26,6 +27,8 @@ public class FailAnimation : Component
public Action OnComplete;
private readonly DrawableRuleset drawableRuleset;
[NotNull]
private readonly ITrack track;
private readonly BindableDouble trackFreq = new BindableDouble(1);
@ -34,7 +37,7 @@ public class FailAnimation : Component
private SampleChannel failSample;
public FailAnimation(DrawableRuleset drawableRuleset, ITrack track)
public FailAnimation(DrawableRuleset drawableRuleset, [NotNull] ITrack track)
{
this.drawableRuleset = drawableRuleset;
this.track = track;

10
osu.Game/Screens/Play/GameplayClockContainer.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework;
@ -27,6 +28,7 @@ public class GameplayClockContainer : Container
private readonly WorkingBeatmap beatmap;
private readonly IReadOnlyList<Mod> mods;
[NotNull]
private ITrack track;
public readonly BindableBool IsPaused = new BindableBool();
@ -60,7 +62,7 @@ public class GameplayClockContainer : Container
private readonly FramedOffsetClock platformOffsetClock;
public GameplayClockContainer(ITrack track, WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
public GameplayClockContainer([NotNull] ITrack track, WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
{
this.beatmap = beatmap;
this.mods = mods;
@ -196,9 +198,6 @@ public void Stop()
/// </summary>
public void StopUsingBeatmapClock()
{
if (track == null)
return;
removeSourceClockAdjustments();
track = new TrackVirtual(track.Length);
@ -217,8 +216,6 @@ protected override void Update()
private void updateRate()
{
if (track == null) return;
speedAdjustmentsApplied = true;
track.ResetSpeedAdjustments();
@ -233,7 +230,6 @@ protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
removeSourceClockAdjustments();
track = null;
}
private void removeSourceClockAdjustments()