summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game/ctrl
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-03-07 19:59:16 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-03-07 19:59:16 +0100
commit6fbcdfdcfb3824acc4ce20d0922492fff8cd546d (patch)
tree215857f8da7dbb2d80efd2d257eb8b21bed5b812 /core/src/ch/asynk/rustanddust/game/ctrl
parent9ae4744a90f032a6bdc92b9c0389f0bc696e9e7f (diff)
downloadRustAndDust-6fbcdfdcfb3824acc4ce20d0922492fff8cd546d.zip
RustAndDust-6fbcdfdcfb3824acc4ce20d0922492fff8cd546d.tar.gz
Battle: clean up the API
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/ctrl')
-rw-r--r--core/src/ch/asynk/rustanddust/game/ctrl/Solo.java6
1 files changed, 4 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 f7d5540..bd9f74c 100644
--- a/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
+++ b/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
@@ -21,9 +21,11 @@ public class Solo extends Ctrl
int me = game.backend.getMyId();
int other = game.backend.getOpponentId();
gameId = game.db.storeGameGetId(me, other, battle.getId(), game.config.gameMode.i);
- battle.init(this, me, other);
+ battle.getPlayer().id = me;
+ battle.getOpponent().id = other;
+ battle.initialDeployment();
} else {
- battle.init(this, game.db.loadState(gameId));
+ battle.load(game.db.loadState(gameId));
}
}