summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-01-12 23:20:31 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-01-12 23:20:31 +0100
commiteb02cfedf54d1320217881ca017ce2274b23c6a7 (patch)
tree9566563bae95848189559bb20a1866a3659fdb34 /core/src
parent1f1d2054d31f2ef1b0aeeecd824a08a83f044855 (diff)
downloadRustAndDust-eb02cfedf54d1320217881ca017ce2274b23c6a7.zip
RustAndDust-eb02cfedf54d1320217881ca017ce2274b23c6a7.tar.gz
Ctrl: set player before calling battle.setup()
Diffstat (limited to 'core/src')
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index d4c38e8..d32c81e 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -61,9 +61,9 @@ public class Ctrl implements Disposable
battle.init();
this.map = battle.getMap();
- battle.setup(this, map);
this.player = battle.getPlayer();
this.opponent = battle.opponent(player);
+ battle.setup(this, map);
this.selectState = new StateSelect(this, map);
this.pathState = new StateMove();