From f3f491374bf383bb53b2b6e521afab6b233855ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Dec 2021 18:12:01 +0900
Subject: [PATCH] Remove unused load checks

---
 .../TestSceneStoryboardSamplePlayback.cs      |  2 +-
 osu.Game/Beatmaps/IWorkingBeatmap.cs          | 20 -------------------
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  4 ----
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
index a718a98aa6..95603b5c04 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void checkForFirstSamplePlayback()
         {
-            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddAssert("storyboard loaded", () => Player.Beatmap.Value.Storyboard != null);
             AddUntilStep("any storyboard samples playing", () => allStoryboardSamples.Any(sound => sound.IsPlaying));
         }
 
diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 0bd589aa7e..3bfbbad714 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -29,26 +29,6 @@ namespace osu.Game.Beatmaps
         ///</summary>
         public bool BeatmapLoaded { get; }
 
-        /// <summary>
-        /// Whether the Background has finished loading.
-        ///</summary>
-        public bool BackgroundLoaded { get; }
-
-        /// <summary>
-        /// Whether the Waveform has finished loading.
-        ///</summary>
-        public bool WaveformLoaded { get; }
-
-        /// <summary>
-        /// Whether the Storyboard has finished loading.
-        ///</summary>
-        public bool StoryboardLoaded { get; }
-
-        /// <summary>
-        /// Whether the Skin has finished loading.
-        ///</summary>
-        public bool SkinLoaded { get; }
-
         /// <summary>
         /// Whether the Track has finished loading.
         ///</summary>
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index bdce60636b..c5b44c3cb4 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -54,10 +54,6 @@ namespace osu.Game.Beatmaps
         #region Load checks
 
         public virtual bool TrackLoaded => loadedTrack != null;
-        public bool WaveformLoaded => waveform.IsResultAvailable;
-        public bool StoryboardLoaded => storyboard.IsResultAvailable;
-        public bool SkinLoaded => skin.IsResultAvailable;
-        public bool BackgroundLoaded => background.IsResultAvailable;
         public virtual bool BeatmapLoaded => beatmapLoadTask?.IsCompleted ?? false;
 
         #endregion