From fff4a9a287cdf144eb9769ceaf0de9d753c4449d Mon Sep 17 00:00:00 2001 From: Lukas Boehm Date: Sun, 11 May 2014 00:27:21 +0200 Subject: [PATCH] Fix wrong + instead of * in recoloring animation code --- src/de/croggle/ui/renderer/BoardActorBoardChangeAnimator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/de/croggle/ui/renderer/BoardActorBoardChangeAnimator.java b/src/de/croggle/ui/renderer/BoardActorBoardChangeAnimator.java index 58afd28..702c748 100644 --- a/src/de/croggle/ui/renderer/BoardActorBoardChangeAnimator.java +++ b/src/de/croggle/ui/renderer/BoardActorBoardChangeAnimator.java @@ -49,7 +49,7 @@ class BoardActorBoardChangeAnimator implements BoardEventListener { private final float ageAnimationDuration = 0.3f; private final float createAnimatonDuration = 0.3f; - private final float recolorAnimationDuration = 0.6f; + private final float recolorAnimationDuration = 0.3f; private final float flashDuration = 0.4f; private final float rotationDuration = 0.4f; @@ -87,7 +87,7 @@ public void onObjectRecolored(ColoredBoardObject recoloredObject) { * TODO unnecessary "if" if recolor events were fired at the right * moment */ - final float duration = recolorAnimationDuration + speedFactor; + final float duration = recolorAnimationDuration * speedFactor; ColoredBoardObjectActor cboa = (ColoredBoardObjectActor) actor; cboa.setMixin(cboa.getBackground());