diff options
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/battles')
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java index be55d2e..205af5e 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 |