From 66ee9d163188908c7084bc77635222ec214f8847 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 9 Nov 2017 17:04:04 +0900
Subject: [PATCH] Update in-line with framework changes

---
 osu-framework                                            | 2 +-
 .../Objects/Drawables/DrawableOsuHitObject.cs            | 9 +++++++--
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 3 ---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu-framework b/osu-framework
index b70ca3de9e..ff1e04024d 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit b70ca3de9ec1a8eb7fb73fcfd169ff38d00b07cd
+Subproject commit ff1e04024d16c0a6cabec7792573b0d019bd1bba
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index e968e5b9df..3e0c23a1ab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -25,8 +25,8 @@ protected sealed override void UpdateState(ArmedState state)
         {
             double transformTime = HitObject.StartTime - TIME_PREEMPT;
 
-            TransformStateTo(transformTime, true);
-            ClearTransformsAfter(transformTime, true);
+            base.ApplyTransformsAt(transformTime, true);
+            base.ClearTransformsAfter(transformTime, true);
 
             using (BeginAbsoluteSequence(transformTime, true))
             {
@@ -46,6 +46,11 @@ protected virtual void UpdateCurrentState(ArmedState state)
         {
         }
 
+        // Todo: At some point we need to move these to DrawableHitObject after ensuring that all other Rulesets apply
+        // transforms in the same way and don't rely on them not being cleared
+        public override void ClearTransformsAfter(double time, bool propagateChildren = false, string targetMember = null) { }
+        public override void ApplyTransformsAt(double time, bool propagateChildren = false) { }
+
         private OsuInputManager osuActionInputManager;
         internal OsuInputManager OsuActionInputManager => osuActionInputManager ?? (osuActionInputManager = GetContainingInputManager() as OsuInputManager);
     }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 99b62f265d..091af04106 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -215,9 +215,6 @@ protected virtual void AddNested(DrawableHitObject<TObject> h)
             nestedHitObjects.Add(h);
         }
 
-        protected override bool AllowStateTransformByParent => false;
-        protected override bool AllowTransformClearByParent => false;
-
         protected abstract void UpdateState(ArmedState state);
     }
 }