From 3092223432b3b4d8118c9f4a814013c346408de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 11 Apr 2016 16:27:58 +0200 Subject: Map4Marshal: Engagement orders JSON assists 'a', conflicts with 'a' activable, rename it 'us' --- core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java | 4 ++-- 1 file 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))); -- cgit v1.1-2-g2b99