From a1f6fb835be0b32ec3023a92ae28be6872ae14a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Mon, 17 Nov 2014 17:45:37 +0100
Subject: Ctrl: do correct calls to battle.getPlayer(...)
---
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 16a6a57..4ec8606 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -53,8 +53,8 @@ public class Ctrl implements Disposable
this.cfg = game.config;
game.ctrl = this;
- this.player = battle.getPlayer(true, false);
- this.opponent = battle.getPlayer(false, false);
+ this.player = battle.getPlayer(true, true);
+ this.opponent = battle.getPlayer(false, true);
this.map = battle.getMap();
battle.setup(this, map);
@@ -121,10 +121,10 @@ public class Ctrl implements Disposable
private void startPlayerTurn()
{
player.turnStart();
+ hud.update();
hud.notify(player.getName() + "'s turn", 2, Position.MIDDLE_CENTER, true);
if (battle.getReinforcement(this))
hud.notify("You have reinforcement", 2, Position.MIDDLE_CENTER, true);
- hud.update();
setState(battle.getState(player));
}
@@ -183,8 +183,8 @@ public class Ctrl implements Disposable
if (player.isDeploymentDone() && opponent.isDeploymentDone()) {
endPlayerTurn();
- player = battle.getPlayer(true, true);
- opponent = battle.getPlayer(false, true);
+ player = battle.getPlayer(true, false);
+ opponent = battle.getPlayer(false, false);
startPlayerTurn();
} else
switchPlayer();
--
cgit v1.1-2-g2b99