Map5Marshal: load/unload Order.activable

1 files changed, 12 insertions, 0 deletions

diff --git a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
index a12d463..af3cfe6 100644
--- a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
+++ b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
@@ -169,6 +169,12 @@ public abstract class Map5Marshal extends Map4Orders implements Marshal
                     unloadPromoteOrder(json, o.unit);
                     break;
             }
+            if (o.activable.size() > 0) {
+                json.writeArrayStart("a");
+                for(Unit u : o.activable)
+                    json.writeValue(u.id);
+                json.writeArrayEnd();
+            }
             json.writeObjectEnd();
         }
         json.writeArrayEnd();
@@ -369,6 +375,12 @@ public abstract class Map5Marshal extends Map4Orders implements Marshal
                     order = loadPromoteOrder(o);
                     break;
             }
+            JsonValue a = o.get("a");
+            if (a != null) {
+                for (int j = 0; j < a.size; j++) {
+                    order.activable.add(findById(a.getInt(j)));
+                }
+            }
             orders.add(order);
         }
     }