From 970968ace26998ad21a6282110610c4504772ce4 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 14 Jan 2016 03:05:43 -0500 Subject: [PATCH] v0.3.4: changed floating text to use rendered font --- .../shatteredpixeldungeon/effects/FloatingText.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java b/src/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java index 16149c09f..bc07e9bd5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java @@ -22,15 +22,15 @@ package com.shatteredpixel.shatteredpixeldungeon.effects; import java.util.ArrayList; -import com.watabou.noosa.BitmapText; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.shatteredpixel.shatteredpixeldungeon.DungeonTilemap; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.watabou.noosa.RenderedText; import com.watabou.utils.SparseArray; -public class FloatingText extends BitmapText { +public class FloatingText extends RenderedText { private static final float LIFESPAN = 1f; private static final float DISTANCE = DungeonTilemap.SIZE; @@ -44,7 +44,6 @@ public class FloatingText extends BitmapText { private static SparseArray> stacks = new SparseArray>(); public FloatingText() { - super(); speed.y = - DISTANCE / LIFESPAN; } @@ -84,14 +83,14 @@ public class FloatingText extends BitmapText { if (cameraZoom != Camera.main.zoom) { cameraZoom = Camera.main.zoom; PixelScene.chooseFont( 9, cameraZoom ); - font = PixelScene.font; - scale.set( PixelScene.scale ); + size( 9 * (int)cameraZoom); + scale.set( 1 /cameraZoom ); } text( text ); hardlight( color ); - measure(); + //measure(); this.x = x - width() / 2; this.y = y - height();