summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-03 16:07:31 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-03 16:07:31 +0100
commit01d2262fe890444c4ea31ff77c2509275205d722 (patch)
tree39322f0a1956c208d730b713ca77a6b5b77ef21a /core/src/ch/asynk/rustanddust/game
parent543ea773f0cd5576f8c8c169938fbaca580e4109 (diff)
downloadRustAndDust-01d2262fe890444c4ea31ff77c2509275205d722.zip
RustAndDust-01d2262fe890444c4ea31ff77c2509275205d722.tar.gz
Map5Marshal: call setFired(), and setMoved() on loading
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game')
-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 8491e0a..f81511f 100644
--- a/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
+++ b/core/src/ch/asynk/rustanddust/game/map/Map5Marshal.java
@@ -272,8 +272,8 @@ public abstract class Map5Marshal extends Map4Orders
Unit.UnitCode code = Unit.UnitCode.valueOf(v.getString("code"));
JsonValue a = v.get("v");
Unit u = game.factory.getUnit(code, a.getBoolean(0), a.getBoolean(1));
- u.hasMoved = a.getBoolean(2);
- u.hasFired = a.getBoolean(3);
+ if (a.getBoolean(2)) u.setMoved();
+ if (a.getBoolean(3)) u.setFired();
u.id = unitId;
if (pos) {
a = v.get("p");