From e4cc3bb89c0d54c121e91c04b0fb0f8d7c58e559 Mon Sep 17 00:00:00 2001 From: "Nut.andor" Date: Mon, 7 Oct 2024 22:11:42 +0200 Subject: [PATCH] rotated tiles doesn't crash the engine anymore (when VALIDATEDATA off) --- .../rpg/AndorsTrail/resource/tiles/TileCache.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java index 4559fdd1c..e61ae212c 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java @@ -76,14 +76,17 @@ public final class TileCache { ResourceFileTile tile = resourceTiles[tileID]; if(tile == null && AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){ L.log("could not find resourceTiles for id: " + tileID); + L.log("iconIDs: " + iconIDs); } - SparseArray tiles = tilesToLoadPerSourceFile.get(tile.tileset); - if (tiles == null) { - tiles = new SparseArray(); - tilesToLoadPerSourceFile.put(tile.tileset, tiles); + if(tile != null || AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA){ + SparseArray tiles = tilesToLoadPerSourceFile.get(tile.tileset); + if (tiles == null) { + tiles = new SparseArray(); + tilesToLoadPerSourceFile.put(tile.tileset, tiles); + } + tiles.put(tileID, tile); + maxTileID = Math.max(maxTileID, tileID); } - tiles.put(tileID, tile); - maxTileID = Math.max(maxTileID, tileID); } boolean hasLoadedTiles = false;