From 45b013c85fff493edadb060b37c2e745af4ee129 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 24 Mar 2017 14:59:59 +0900
Subject: [PATCH] Fix post-merge errors.

---
 .../Objects/Drawable/DrawableHit.cs             | 17 ++++++++++-------
 .../Objects/Drawable/DrawableHitFinisher.cs     |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
index 4f3e06cd6d..cc017ab376 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
@@ -21,38 +21,41 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         /// A list of keys which this hit object will accept. These are the standard Taiko keys for now.
         /// These should be moved to bindings later.
         /// </summary>
-        private List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
+        private readonly List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
+
+        private readonly Hit hit;
 
         /// <summary>
         /// Whether the last key pressed is a valid hit key.
         /// </summary>
         private bool validKeyPressed;
 
-        protected DrawableHit(TaikoHitObject hitObject)
-            : base(hitObject)
+        protected DrawableHit(Hit hit)
+            : base(hit)
         {
+            this.hit = hit;
         }
 
         protected override void CheckJudgement(bool userTriggered)
         {
             if (!userTriggered)
             {
-                if (Judgement.TimeOffset > HitObject.HitWindowGood)
+                if (Judgement.TimeOffset > hit.HitWindowGood)
                     Judgement.Result = HitResult.Miss;
                 return;
             }
 
             double hitOffset = Math.Abs(Judgement.TimeOffset);
 
-            if (hitOffset > HitObject.HitWindowMiss)
+            if (hitOffset > hit.HitWindowMiss)
                 return;
 
             if (!validKeyPressed)
                 Judgement.Result = HitResult.Miss;
-            else if (hitOffset < HitObject.HitWindowGood)
+            else if (hitOffset < hit.HitWindowGood)
             {
                 Judgement.Result = HitResult.Hit;
-                Judgement.TaikoResult = hitOffset < HitObject.HitWindowGreat ? TaikoHitResult.Great : TaikoHitResult.Good;
+                Judgement.TaikoResult = hitOffset < hit.HitWindowGreat ? TaikoHitResult.Great : TaikoHitResult.Good;
             }
             else
                 Judgement.Result = HitResult.Miss;
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHitFinisher.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHitFinisher.cs
index c72b520cc4..3f7361b62c 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHitFinisher.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHitFinisher.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         private double firstHitTime;
         private Key firstHitKey;
 
-        protected DrawableHitFinisher(TaikoHitObject hitObject)
-            : base(hitObject)
+        protected DrawableHitFinisher(Hit hit)
+            : base(hit)
         {
         }