summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game/Ctrl.java
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/Ctrl.java')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Ctrl.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java
index 807abe8..f389d2d 100644
--- a/core/src/ch/asynk/rustanddust/game/Ctrl.java
+++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java
@@ -57,7 +57,7 @@ public class Ctrl implements Disposable
this.cfg = game.config;
game.ctrl = this;
- this.map = battle.setup(this);
+ this.map = battle.setup();
this.selectState = new StateSelect();
this.pathState = new StateMove();
@@ -114,7 +114,7 @@ public class Ctrl implements Disposable
{
battle.getPlayer().turnStart();
// hud.notify(battle.getPlayer().getName() + "'s turn", 2, Position.MIDDLE_CENTER, true);
- if (battle.getReinforcement(this))
+ if (battle.hasReinforcement())
hud.notify("You have reinforcement", 2, Position.MIDDLE_CENTER, true);
hud.update();
setState(battle.getState());
@@ -123,7 +123,7 @@ public class Ctrl implements Disposable
private void endPlayerTurn()
{
battle.getPlayer().turnEnd();
- Player winner = battle.checkVictory(this);
+ Player winner = battle.getVictor();
if (winner != null)
hud.victory(winner, ((winner == battle.getPlayer()) ? battle.getOpponent() : battle.getPlayer()));
}