From 4d0b23062e60ff761d32b713debab8e7abb8ab3a Mon Sep 17 00:00:00 2001 From: Zukero Date: Fri, 12 Aug 2016 15:49:49 +0200 Subject: [PATCH] Fixed tloading of the new tilesets. --- .../src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java | 2 ++ .../src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java index d47539531..22b86247e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java @@ -239,6 +239,7 @@ public final class ResourceLoader { loader.prepareTileset(R.drawable.actorconditions_1, "actorconditions_1", new Size(14, 8), defaultTileSize); loader.prepareTileset(R.drawable.actorconditions_2, "actorconditions_2", src_sz3x1, defaultTileSize); + loader.prepareTileset(R.drawable.actorconditions_japozero, "actorconditions_japozero", new Size(16, 4), defaultTileSize); loader.prepareTileset(R.drawable.items_armours, "items_armours", new Size(14, 3), defaultTileSize); loader.prepareTileset(R.drawable.items_weapons, "items_weapons", new Size(14, 6), defaultTileSize); @@ -261,6 +262,7 @@ public final class ResourceLoader { loader.prepareTileset(R.drawable.items_armours_2, "items_armours_2", src_sz7x1, defaultTileSize); loader.prepareTileset(R.drawable.items_armours_3, "items_armours_3", new Size(10, 4), defaultTileSize); loader.prepareTileset(R.drawable.items_rings_1, "items_rings_1", new Size(10, 3), defaultTileSize); + loader.prepareTileset(R.drawable.items_japozero, "items_japozero", new Size(16, 37), defaultTileSize); loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", src_sz1x1, defaultTileSize); loader.prepareTileset(R.drawable.monsters_cyclops, "monsters_cyclops", src_sz1x1, dst_sz2x3); 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 82fa8c870..293e2eb0b 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java @@ -61,7 +61,7 @@ public final class TileManager { public final TileCache tileCache = new TileCache(); - public final TileCollection preloadedTiles = new TileCollection(113); + public final TileCollection preloadedTiles = new TileCollection(116); public TileCollection currentMapTiles; public TileCollection adjacentMapTiles; private final HashSet preloadedTileIDs = new HashSet();