diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-17 21:32:00 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-17 21:32:00 +0100 |
| commit | 1688548e13ee112cd97a2bf2c121c6c7fdc6c4a3 (patch) | |
| tree | b71f931baca1c40ffe51bfca23742a722bd6b879 /core/src | |
| parent | d817b106ecb4b29334d68b657a09254c8f7d4069 (diff) | |
| download | RustAndDust-1688548e13ee112cd97a2bf2c121c6c7fdc6c4a3.zip RustAndDust-1688548e13ee112cd97a2bf2c121c6c7fdc6c4a3.tar.gz | |
Battle: getReinforcement(Ctrl) -> getReinforcement(Ctrl, Map)
Diffstat (limited to 'core/src')
5 files changed, 6 insertions, 6 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Battle.java b/core/src/ch/asynk/tankontank/game/Battle.java index 6f38a21..cffbc75 100644 --- a/core/src/ch/asynk/tankontank/game/Battle.java +++ b/core/src/ch/asynk/tankontank/game/Battle.java @@ -17,7 +17,7 @@ public interface Battle public Player checkVictory(Ctrl ctrl); - public boolean getReinforcement(Ctrl ctrl); + public boolean getReinforcement(Ctrl ctrl, Map map); public EntryPoint getEntryPoint(Unit unit); diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index 4ec8606..901a36d 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -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)) + if (battle.getReinforcement(this, map)) hud.notify("You have reinforcement", 2, Position.MIDDLE_CENTER, true); + hud.update(); setState(battle.getState(player)); } diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java index 1f99fec..ef5f79b 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java @@ -63,7 +63,7 @@ public class BattleFrontalAssault extends BattleCommon } @Override - public boolean getReinforcement(Ctrl ctrl) + public boolean getReinforcement(Ctrl ctrl, Map map) { return false; } diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java index 7e392a6..253bf90 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java @@ -59,7 +59,7 @@ public class BattleHeadToHead extends BattleCommon } @Override - public boolean getReinforcement(Ctrl ctrl) + public boolean getReinforcement(Ctrl ctrl, Map map) { return false; } diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java b/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java index c1a0fbf..6682310 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java @@ -63,7 +63,7 @@ public class BattleLastStand extends BattleCommon } @Override - public boolean getReinforcement(Ctrl ctrl) + public boolean getReinforcement(Ctrl ctrl, Map map) { return false; } |