summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-04-11 16:27:58 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2016-04-11 16:27:58 +0200
commit3092223432b3b4d8118c9f4a814013c346408de3 (patch)
treec77a4df47f09957c30eb5d6f334a15578a70649a /core
parent031ad670a7ec12c755e2c34baf5a2b79a32df473 (diff)
downloadRustAndDust-3092223432b3b4d8118c9f4a814013c346408de3.zip
RustAndDust-3092223432b3b4d8118c9f4a814013c346408de3.tar.gz
Map4Marshal: Engagement orders JSON assists 'a', conflicts with 'a' activable, rename it 'us'
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
index d73308f..5f4118d 100644
--- a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
+++ b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
@@ -217,7 +217,7 @@ public abstract class Map5Marshal extends Map4Orders implements Marshal
json.writeValue(e.attacker.id);
json.writeValue(e.defender.id);
json.writeArrayEnd();
- json.writeArrayStart("a");
+ json.writeArrayStart("us");
for (Unit u : e.assists)
json.writeValue(u.id);
json.writeArrayEnd();
@@ -435,7 +435,7 @@ public abstract class Map5Marshal extends Map4Orders implements Marshal
JsonValue a = v.get("u");
o.setEngage(findById(a.getInt(0)), findById(a.getInt(1)));
- a = v.get("a");
+ a = v.get("us");
for (int i = 0; i < a.size; i++)
o.engagement.assists.add(findById(a.getInt(i)));