From 3688cb09143f3d5ff8ceef99186a40353c2e6552 Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Sat, 22 Jun 2013 17:48:02 +0200 Subject: [PATCH] Minor fixes to dynamic map tiles. --- .../src/com/gpl/rpg/AndorsTrail/model/map/MapSection.java | 4 +--- .../gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java | 2 +- .../src/com/gpl/rpg/AndorsTrail/util/ByteUtils.java | 7 +++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapSection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapSection.java index b1b07e1e1..1647bb139 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapSection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapSection.java @@ -34,9 +34,7 @@ public final class MapSection { System.arraycopy(replaceLayersWith.isWalkable[sx], 0, isWalkable[dx], dy, height); } } - for(int i = 0; i < layoutHash.length; ++i) { - layoutHash[i] ^= replaceLayersWith.layoutHash[i]; - } + ByteUtils.xorArray(layoutHash, replaceLayersWith.layoutHash); } private static void replaceTileLayerSection(MapLayer dest, MapLayer src, CoordRect area) { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java index e962e6db4..523ef40a6 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java @@ -222,7 +222,7 @@ public final class TMXMapTranslator { QuestProgress requireQuestStage = QuestProgress.parseQuestProgress(obj.name); if (requireQuestStage == null) { if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) { - L.log("OPTIMIZE: Map " + map.name + " contains replace area that cannot be parsed as a quest stage."); + L.log("WARNING: Map " + map.name + " contains replace area that cannot be parsed as a quest stage."); } continue; } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ByteUtils.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ByteUtils.java index b3db4f716..5a8e38870 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ByteUtils.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ByteUtils.java @@ -13,4 +13,11 @@ public final class ByteUtils { } return result.toString(); } + + public static void xorArray(byte[] array, byte[] mask) { + final int len = Math.min(array.length, mask.length); + for(int i = 0; i < len; ++i) { + array[i] ^= mask[i]; + } + } }