summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-01-19 17:43:41 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-01-19 17:43:41 +0100
commitf7aadf54fe4e011362941050203afc39d4abdbc4 (patch)
treecbc447880b732d07a78e1cc2abae4c41da684a65 /core
parent3b5a424fdf4e8963ab218775e35f60a36da2bc28 (diff)
downloadRustAndDust-f7aadf54fe4e011362941050203afc39d4abdbc4.zip
RustAndDust-f7aadf54fe4e011362941050203afc39d4abdbc4.tar.gz
Revert "Ctrl: set player before calling battle.setup()"
setup() gives units to players, getPlayer() can then be called This reverts commit eb02cfedf54d1320217881ca017ce2274b23c6a7.
Diffstat (limited to 'core')
-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 58b2856..82ba7f1 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();