From b36fd00234e241480ce3be488e8e18ca139957f5 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Sun, 15 Feb 2015 15:41:54 -0500
Subject: [PATCH] v0.2.4: fixed a bug with EmoIcons
---
.../shatteredpixeldungeon/effects/EmoIcon.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/effects/EmoIcon.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/EmoIcon.java
index a45abc7b8..17469d00a 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/effects/EmoIcon.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/EmoIcon.java
@@ -46,13 +46,13 @@ public class EmoIcon extends Image {
if (visible) {
if (growing) {
- scale.set( scale.x + Game.elapsed * timeScale );
- if (scale.x > maxSize) {
+ scale.set( Math.min(scale.x + Game.elapsed * timeScale, maxSize ));
+ if (scale.x >= maxSize) {
growing = false;
}
} else {
- scale.set( scale.x - Game.elapsed * timeScale );
- if (scale.x < 1) {
+ scale.set( Math.max(scale.x - Game.elapsed * timeScale, 1f ));
+ if (scale.x <= 1) {
growing = true;
}
}