From f7aadf54fe4e011362941050203afc39d4abdbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 19 Jan 2015 17:43:41 +0100 Subject: Revert "Ctrl: set player before calling battle.setup()" setup() gives units to players, getPlayer() can then be called This reverts commit eb02cfedf54d1320217881ca017ce2274b23c6a7. --- core/src/ch/asynk/tankontank/game/Ctrl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); -- cgit v1.1-2-g2b99