From 62656b98dffd155d752a37fa86ca6ec2f6d1aa1b Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Wed, 10 May 2017 20:39:13 +0900
Subject: [PATCH] Internalize HitObjects to playfields, since some playfields
 may not use that container.

---
 osu.Game/Rulesets/UI/HitRenderer.cs | 11 ++++++++---
 osu.Game/Rulesets/UI/Playfield.cs   |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitRenderer.cs b/osu.Game/Rulesets/UI/HitRenderer.cs
index bae8c5e75b..cbca4fbfa2 100644
--- a/osu.Game/Rulesets/UI/HitRenderer.cs
+++ b/osu.Game/Rulesets/UI/HitRenderer.cs
@@ -187,17 +187,19 @@ namespace osu.Game.Rulesets.UI
 
         public sealed override bool ProvidingUserCursor => !HasReplayLoaded && Playfield.ProvidingUserCursor;
 
-        protected override Container<Drawable> Content => content;
-        protected override bool AllObjectsJudged => Playfield.HitObjects.Children.All(h => h.Judged);
+        public override IEnumerable<HitObject> Objects => Beatmap.HitObjects;
+
+        protected override bool AllObjectsJudged => drawableObjects.All(o => o.Judged);
 
         /// <summary>
         /// The playfield.
         /// </summary>
         protected Playfield<TObject, TJudgement> Playfield;
 
+        protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        public override IEnumerable<HitObject> Objects => Beatmap.HitObjects;
+        private List<DrawableHitObject<TObject, TJudgement>> drawableObjects = new List<DrawableHitObject<TObject, TJudgement>>();
 
         protected HitRenderer(WorkingBeatmap beatmap)
             : base(beatmap)
@@ -224,6 +226,8 @@ namespace osu.Game.Rulesets.UI
 
         private void loadObjects()
         {
+            drawableObjects.Clear();
+
             foreach (TObject h in Beatmap.HitObjects)
             {
                 var drawableObject = GetVisualRepresentation(h);
@@ -233,6 +237,7 @@ namespace osu.Game.Rulesets.UI
 
                 drawableObject.OnJudgement += onJudgement;
 
+                drawableObjects.Add(drawableObject);
                 Playfield.Add(drawableObject);
             }
 
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 0586c0385a..612569a9ae 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// The HitObjects contained in this Playfield.
         /// </summary>
-        public HitObjectContainer<DrawableHitObject<TObject, TJudgement>> HitObjects;
+        protected HitObjectContainer<DrawableHitObject<TObject, TJudgement>> HitObjects;
 
         internal Container<Drawable> ScaledContent;