summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/ch/asynk/rustanddust')
-rw-r--r--core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java5
1 files changed, 3 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 b6f9a18..a961b11 100644
--- a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
+++ b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
@@ -27,6 +27,8 @@ public abstract class Map5Marshal extends Map4Orders implements Marshal
{
private static UnitList units = new UnitList(30);
+ public void clearMarshalUnits() { units.clear(); }
+
public Map5Marshal(final RustAndDust game, Texture map, SelectedTile hex)
{
super(game, map, hex);
@@ -261,12 +263,11 @@ public abstract class Map5Marshal extends Map4Orders implements Marshal
loadMap(v.get("map"));
else if(mode == Marshal.Mode.ORDERS)
loadOrders(v.get("orders"));
- units.clear();
}
public void loadPlayers(JsonValue v, Player[] players)
{
- units.clear();
+ clearMarshalUnits();
players[0] = loadPlayer(v.get("players").get(0));
players[1] = loadPlayer(v.get("players").get(1));
}