From 8a15825b13459d74e1ce157c90881dad92c87e3d Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Wed, 27 Jan 2016 12:13:02 +0100
Subject: Battle,Ctrl: clean up initialisation phase

---
 core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'core/src/ch/asynk/rustanddust/game/battles')

diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index be55d2e2..205af5e7 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -3,7 +3,6 @@ package ch.asynk.rustanddust.game.battles;
 import java.util.Random;
 import java.util.HashMap;
 
-import ch.asynk.rustanddust.game.Ctrl;
 import ch.asynk.rustanddust.game.Army;
 import ch.asynk.rustanddust.game.Battle;
 import ch.asynk.rustanddust.game.Player;
@@ -94,14 +93,12 @@ public abstract class BattleCommon implements Battle
     }
 
     @Override
-    public State.StateType setup(Ctrl ctrl)
+    public void init()
     {
         this.map = ctrl.map;
         this.usPlayer = factory.getPlayer(Army.US);
         this.gePlayer = factory.getPlayer(Army.GE);
 
-        ctrl.hud.update();
-        ctrl.init();
         setupMap();
 
         this.currentPlayer = this.usPlayer;
@@ -117,8 +114,6 @@ public abstract class BattleCommon implements Battle
         map.turnDone();
 
         this.currentPlayer = getFirstPlayer();
-
-        return getState();
     }
 
     @Override
-- 
cgit v1.2.3