From 6c2e8e0eeaa9b9e6c2edd442e4143791ea4cb670 Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 22 Jun 2014 21:57:56 +0000 Subject: [PATCH] Fix compile warnings --- .../src/main/java/forge/screens/home/VHomeUI.java | 1 - forge-gui-mobile/src/forge/Forge.java | 1 - forge-gui-mobile/src/forge/assets/FSkinFont.java | 7 ++++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java index bff888cea50..c8bd2f78525 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java @@ -31,7 +31,6 @@ import forge.screens.home.quest.*; import forge.screens.home.sanctioned.VSubmenuConstructed; import forge.screens.home.sanctioned.VSubmenuDraft; import forge.screens.home.sanctioned.VSubmenuSealed; -import forge.screens.home.sanctioned.VSubmenuWinston; import forge.screens.home.settings.VSubmenuAvatars; import forge.screens.home.settings.VSubmenuDownloaders; import forge.screens.home.settings.VSubmenuPreferences; diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 288c2f145a6..12a4c8b02a6 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -8,7 +8,6 @@ import com.badlogic.gdx.ApplicationListener; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.utils.Clipboard; import forge.assets.AssetsDownloader; diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java index 4196cb16b7b..4ffd5abcf92 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinFont.java +++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java @@ -17,6 +17,7 @@ import com.badlogic.gdx.graphics.g2d.PixmapPacker; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; +import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; import com.badlogic.gdx.graphics.glutils.PixmapTextureData; import com.badlogic.gdx.utils.Array; @@ -193,7 +194,11 @@ public class FSkinFont { String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890\"!?'.,;:()[]{}<>|/@\\^$-%+=#_&*"; final PixmapPacker packer = new PixmapPacker(pageSize, pageSize, Pixmap.Format.RGBA8888, 2, false); - final FreeTypeFontGenerator.FreeTypeBitmapFontData fontData = generator.generateData(fontSize, chars, false, packer); + final FreeTypeFontParameter parameter = new FreeTypeFontParameter(); + parameter.characters = chars; + parameter.size = fontSize; + parameter.packer = packer; + final FreeTypeFontGenerator.FreeTypeBitmapFontData fontData = generator.generateData(parameter); final Array pages = packer.getPages(); //finish generating font on UI thread