Skip to content

Commit

Permalink
Fix wrong + instead of * in recoloring animation code
Browse files Browse the repository at this point in the history
  • Loading branch information
suluke committed May 10, 2014
1 parent 3c9cbef commit fff4a9a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/de/croggle/ui/renderer/BoardActorBoardChangeAnimator.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down

0 comments on commit fff4a9a

Please sign in to comment.