From ba10b43f7e3f357db9dc9f68e1863ee1d1c352ba Mon Sep 17 00:00:00 2001 From: yugecin Date: Sun, 25 Dec 2016 21:48:44 +0100 Subject: [PATCH] fix slider circle animation color on mirrored slider --- src/itdelatrisu/opsu/GameData.java | 4 ++-- src/itdelatrisu/opsu/objects/Slider.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java index af71979d..e35a079e 100644 --- a/src/itdelatrisu/opsu/GameData.java +++ b/src/itdelatrisu/opsu/GameData.java @@ -1269,13 +1269,13 @@ public class GameData { * @param color the slider color * @param expand whether or not the hit result animation should expand */ - public void sendSliderStartResult(int time, float x, float y, Color color, boolean expand) { + public void sendSliderStartResult(int time, float x, float y, Color color, Color mirrorColor, boolean expand) { hitResultList.add(new HitObjectResult(time, HIT_ANIMATION_RESULT, x, y, color, HitObjectType.CIRCLE, null, expand, true)); if (!Options.isMirror()) { return; } float[] m = Utils.mirrorPoint(x, y); - hitResultList.add(new HitObjectResult(time, HIT_ANIMATION_RESULT, m[0], m[1], color, HitObjectType.CIRCLE, null, expand, true)); + hitResultList.add(new HitObjectResult(time, HIT_ANIMATION_RESULT, m[0], m[1], mirrorColor, HitObjectType.CIRCLE, null, expand, true)); } /** diff --git a/src/itdelatrisu/opsu/objects/Slider.java b/src/itdelatrisu/opsu/objects/Slider.java index 041a102f..f8ad3441 100644 --- a/src/itdelatrisu/opsu/objects/Slider.java +++ b/src/itdelatrisu/opsu/objects/Slider.java @@ -595,10 +595,10 @@ public class Slider extends GameObject { if (timeDiff < hitResultOffset[GameData.HIT_50]) { result = GameData.HIT_SLIDER30; ticksHit++; - data.sendSliderStartResult(trackPosition, this.x, this.y, color, true); + data.sendSliderStartResult(trackPosition, this.x, this.y, color, mirrorColor, true); } else if (timeDiff < hitResultOffset[GameData.HIT_MISS]) { result = GameData.HIT_MISS; - data.sendSliderStartResult(trackPosition, this.x, this.y, color, false); + data.sendSliderStartResult(trackPosition, this.x, this.y, color, mirrorColor, false); } //else not a hit @@ -627,10 +627,10 @@ public class Slider extends GameObject { if (isAutoMod) { // "auto" mod: catch any missed notes due to lag ticksHit++; data.sendSliderTickResult(time, GameData.HIT_SLIDER30, x, y, hitObject, currentRepeats); - data.sendSliderStartResult(time, x, y, color, true); + data.sendSliderStartResult(time, x, y, color, mirrorColor, true); } else { data.sendSliderTickResult(time, GameData.HIT_MISS, x, y, hitObject, currentRepeats); - data.sendSliderStartResult(trackPosition, x, y, color, false); + data.sendSliderStartResult(trackPosition, x, y, color, mirrorColor, false); } } @@ -640,7 +640,7 @@ public class Slider extends GameObject { ticksHit++; sliderClickedInitial = true; data.sendSliderTickResult(time, GameData.HIT_SLIDER30, x, y, hitObject, currentRepeats); - data.sendSliderStartResult(time, x, y, color, true); + data.sendSliderStartResult(time, x, y, color, mirrorColor, true); } }