From 584548bde40ef060473a72f36715b0deb1dc4838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sat, 18 Oct 2014 07:52:03 +0200 Subject: Ctrl: map must be created before states --- core/src/ch/asynk/tankontank/game/Ctrl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index 867e88a..b0f383d 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -38,6 +38,11 @@ public class Ctrl implements Disposable this.cfg = game.config; game.ctrl = this; + this.player = battle.getFirstPlayer(); + this.opponent = battle.getSecondPlayer(); + this.map = battle.getMap(); + battle.setup(map, player, opponent); + this.selectState = new StateSelect(this, map); this.pathState = new StateMove(); this.rotateState = new StateRotate(); @@ -47,11 +52,6 @@ public class Ctrl implements Disposable this.state = selectState; - this.player = battle.getFirstPlayer(); - this.opponent = battle.getSecondPlayer(); - this.map = battle.getMap(); - battle.setup(map, player, opponent); - this.hud = new Hud(this, game); player.turnStart(); -- cgit v1.1-2-g2b99