From e7a93073a445e15007929844f62bd537da4ee858 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Wed, 22 Mar 2017 01:42:40 +0900
Subject: [PATCH] Fix post-merge errors.

---
 osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs | 6 +++---
 osu.Game.Modes.Taiko/UI/JudgementText.cs                | 6 +++---
 osu.Game.Modes.Taiko/UI/RingExplosion.cs                | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
index 787bca5832..488b2f192e 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
@@ -31,15 +31,15 @@ namespace osu.Desktop.VisualTests.Tests
 
         private void addHitJudgement()
         {
-            TaikoScoreResult score = RNG.Next(2) == 0 ? TaikoScoreResult.Good : TaikoScoreResult.Great;
+            TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;
 
             playfield.OnJudgement(new DrawableTestHit(new TaikoHitObject())
             {
-                X = RNG.NextSingle(score == TaikoScoreResult.Good ? -0.1f : -0.05f, score == TaikoScoreResult.Good ? 0.1f : 0.05f),
+                X = RNG.NextSingle(hitResult == TaikoHitResult.Good ? -0.1f : -0.05f, hitResult == TaikoHitResult.Good ? 0.1f : 0.05f),
                 Judgement = new TaikoJudgementInfo
                 {
                     Result = HitResult.Hit,
-                    Score = score,
+                    TaikoResult = hitResult,
                     TimeOffset = 0,
                     ComboAtHit = 1,
                     SecondHit = RNG.Next(10) == 0
diff --git a/osu.Game.Modes.Taiko/UI/JudgementText.cs b/osu.Game.Modes.Taiko/UI/JudgementText.cs
index a65e85e0af..5156020931 100644
--- a/osu.Game.Modes.Taiko/UI/JudgementText.cs
+++ b/osu.Game.Modes.Taiko/UI/JudgementText.cs
@@ -97,14 +97,14 @@ namespace osu.Game.Modes.Taiko.UI
                     movementDirection = 1;
                     break;
                 case HitResult.Hit:
-                    switch (Judgement.Score)
+                    switch (Judgement.TaikoResult)
                     {
-                        case TaikoScoreResult.Good:
+                        case TaikoHitResult.Good:
                             judgementColour = colours.Green;
                             judgementText = "GOOD";
                             textContainer.Scale = new Vector2(0.45f);
                             break;
-                        case TaikoScoreResult.Great:
+                        case TaikoHitResult.Great:
                             judgementColour = colours.Blue;
                             judgementText = "GREAT";
                             break;
diff --git a/osu.Game.Modes.Taiko/UI/RingExplosion.cs b/osu.Game.Modes.Taiko/UI/RingExplosion.cs
index e405fa0bfb..6400b0d573 100644
--- a/osu.Game.Modes.Taiko/UI/RingExplosion.cs
+++ b/osu.Game.Modes.Taiko/UI/RingExplosion.cs
@@ -55,12 +55,12 @@ namespace osu.Game.Modes.Taiko.UI
             if (Judgement.SecondHit)
                 Size *= 1.5f;
 
-            switch (Judgement.Score)
+            switch (Judgement.TaikoResult)
             {
-                case TaikoScoreResult.Good:
+                case TaikoHitResult.Good:
                     innerFill.Colour = colours.Green;
                     break;
-                case TaikoScoreResult.Great:
+                case TaikoHitResult.Great:
                     innerFill.Colour = colours.Blue;
                     break;
             }