summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game/ctrl
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-03-22 15:48:41 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-03-22 15:48:41 +0100
commitc822ee999fd7aea0f796b732ba8e458304c728a7 (patch)
tree11e305eec59f92a009e5d45029ab40ce48e62554 /core/src/ch/asynk/rustanddust/game/ctrl
parent95ddd472d09244612b70e5c62f35a52c6185df7b (diff)
downloadRustAndDust-c822ee999fd7aea0f796b732ba8e458304c728a7.zip
RustAndDust-c822ee999fd7aea0f796b732ba8e458304c728a7.tar.gz
Battle: unload turnCount into JSON
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/ctrl')
-rw-r--r--core/src/ch/asynk/rustanddust/game/ctrl/Solo.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java b/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
index d7cda5c..5473cd5 100644
--- a/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
+++ b/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
@@ -28,8 +28,8 @@ public class Solo extends Ctrl
} else {
GameRecord r = game.db.loadGame(gameId);
if (r != null) {
- battle.load(Marshal.Mode.STATE, r.turn, r.state);
- battle.load(Marshal.Mode.ORDERS, r.turn, r.orders);
+ battle.load(Marshal.Mode.STATE, r.state);
+ battle.load(Marshal.Mode.ORDERS, r.orders);
battle.getMap().clearMarshalUnits();
r.dispose();
} else