summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-04-11 13:52:08 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2016-04-11 13:52:08 +0200
commite87e5260b18c59a8d2ff931acbd0ee4457b58d13 (patch)
tree3ff5878c916d81d5828e76082c3876a98b067f09 /core/src/ch/asynk/rustanddust
parent4712d9d3c617dbd146d4c84f65f64c1dd3c89750 (diff)
downloadRustAndDust-e87e5260b18c59a8d2ff931acbd0ee4457b58d13.zip
RustAndDust-e87e5260b18c59a8d2ff931acbd0ee4457b58d13.tar.gz
BattleCommon: must load map before Players, to have exit and entry Zones available
Diffstat (limited to 'core/src/ch/asynk/rustanddust')
-rw-r--r--core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index e88600c..e938f69 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -103,12 +103,12 @@ public abstract class BattleCommon implements Battle
public void load(Marshal.Mode mode, JsonValue value)
{
+ map.load(mode, value);
if((mode == Marshal.Mode.FULL) || (mode == Marshal.Mode.STATE)) {
JsonValue v = value.get("battle");
this.turnCount = v.getInt("turnCount");
map.loadPlayers(value, players);
}
- map.load(mode, value);
this.currentPlayer = players[0];
}