diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2016-02-03 11:57:03 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2016-02-03 11:57:03 +0100 |
commit | 94d279a514326f747ccac8c803b4500955c7a368 (patch) | |
tree | 448c3d46dd5257b8e7021cd4a5ebd0d911ccc018 /core/src/ch/asynk/rustanddust/game/map | |
parent | cbcfb75fbd51915b68c51d15d85fe102a85b50de (diff) | |
download | RustAndDust-94d279a514326f747ccac8c803b4500955c7a368.zip RustAndDust-94d279a514326f747ccac8c803b4500955c7a368.tar.gz |
PawnId/UnitID -> PawnCode/UnitCode
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/map')
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java index faf6443..fc79203 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java @@ -83,7 +83,7 @@ public abstract class Map5Marshal extends Map4Orders private void unload(Json json, Unit unit, boolean pos) { json.writeObjectStart(); - json.writeValue("id", unit.id); + json.writeValue("id", unit.code); json.writeArrayStart("v"); json.writeValue(unit.hq); json.writeValue(unit.ace); @@ -131,7 +131,7 @@ public abstract class Map5Marshal extends Map4Orders unload(json, o.engagement); break; case PROMOTE: - json.writeValue("id", o.unit.id); + json.writeValue("id", o.unit.code); json.writeArrayStart("p"); json.writeValue(o.unitHex.getCol()); json.writeValue(o.unitHex.getRow()); @@ -145,7 +145,7 @@ public abstract class Map5Marshal extends Map4Orders private void unload(Json json, Move m) { json.writeValue("type", m.type); - json.writeValue("id", ((Unit) m.pawn).id); + json.writeValue("id", ((Unit) m.pawn).code); if (m.from != null) { json.writeArrayStart("from"); json.writeValue(m.from.getCol()); @@ -196,7 +196,7 @@ public abstract class Map5Marshal extends Map4Orders { if (key != null) json.writeObjectStart(key); else json.writeObjectStart(); - json.writeValue("id", u.id); + json.writeValue("id", u.code); Hex h = u.getHex(); json.writeArrayStart("p"); json.writeValue(h.getCol()); |