From 46ae78b8d92c63e9d42284a528dfe90d2dbb376a Mon Sep 17 00:00:00 2001 From: Zukero Date: Wed, 29 Apr 2015 18:18:08 +0200 Subject: [PATCH] Added missing BWM map (39a) to resource list. Added limit to 32x32 bitmap loading (<32x32px for density <1, ==32x32px for density >=1). --- AndorsTrail/res/values/loadresources.xml | 1 + .../gpl/rpg/AndorsTrail/resource/tiles/TileManager.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml index 660f592ad..b2e3b5e89 100644 --- a/AndorsTrail/res/values/loadresources.xml +++ b/AndorsTrail/res/values/loadresources.xml @@ -392,6 +392,7 @@ @xml/blackwater_mountain37 @xml/blackwater_mountain38 @xml/blackwater_mountain39 + @xml/blackwater_mountain39a @xml/blackwater_mountain40 @xml/blackwater_mountain41 @xml/blackwater_mountain42 diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java index 51007c19f..02abde14d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java @@ -117,14 +117,14 @@ public final class TileManager { public void setDensity(Resources r) { density = r.getDisplayMetrics().density; - tileSize = (int) (32 * density); -// if (density < 1) tileSize = (int) (32 * density); -// else tileSize = 32; +// tileSize = (int) (32 * density); + if (density < 1) tileSize = (int) (32 * density); + else tileSize = 32; } public void updatePreferences(AndorsTrailPreferences prefs) { float densityScaler = 1; -// if (density > 1) densityScaler = density; + if (density > 1) densityScaler = density; scale = prefs.scalingFactor * densityScaler; viewTileSize = (int) (tileSize * prefs.scalingFactor * densityScaler); }