Merging 1.7.5 Source: effect changes

2015-01-29 16:05:19 -05:00
parent 1b10338b37
commit d6bcece8af
15 changed files with 355 additions and 24 deletions
@@ -20,6 +20,7 @@ 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;
@@ -34,17 +35,13 @@ public class FloatingText extends BitmapText {
 	private float timeLeft;
 	
 	private int key = -1;
-	
+
+	private float cameraZoom = -1;
+
 	private static SparseArray<ArrayList<FloatingText>> stacks = new SparseArray<ArrayList<FloatingText>>();
 	
 	public FloatingText() {
-		
 		super();
-
-		PixelScene.chooseFont( 9 );
-		font = PixelScene.font;
-		scale.set( PixelScene.scale );
-		
 		speed.y = - DISTANCE / LIFESPAN;
 	}
 	
@@ -81,6 +78,13 @@ public class FloatingText extends BitmapText {
 		
 		revive();

+		if (cameraZoom != Camera.main.zoom) {
+			cameraZoom = Camera.main.zoom;
+			PixelScene.chooseFont( 9, cameraZoom );
+			font = PixelScene.font;
+			scale.set( PixelScene.scale );
+		}
+
 		text( text );
 		hardlight( color );