diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-17 09:50:57 +0200 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-17 09:50:57 +0200 |
commit | 92917aa0c7612911ae4ebbf005baf96a71e3e9b1 (patch) | |
tree | 03747c2ad35378ca12f958644f4e969b7e285b7a /core/src/ch/asynk/tankontank/game/Ctrl.java | |
parent | b10253415d85866db1305bce381874163146062b (diff) | |
download | RustAndDust-92917aa0c7612911ae4ebbf005baf96a71e3e9b1.zip RustAndDust-92917aa0c7612911ae4ebbf005baf96a71e3e9b1.tar.gz |
Player: currentPlayer()/otherPlayer() -> player()/opponent()
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/Ctrl.java')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index b069e89..ad8c37f 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -55,7 +55,7 @@ public class Ctrl implements Disposable this.hud = new Hud(this, game); - currentPlayer().turnStart(); + player().turnStart(); } @Override @@ -65,12 +65,12 @@ public class Ctrl implements Disposable map.dispose(); } - public Player currentPlayer() + public Player player() { return this.players[player]; } - public Player otherPlayer() + public Player opponent() { return this.players[((player + 1) % 2)]; } @@ -102,11 +102,26 @@ public class Ctrl implements Disposable private void nextPlayer() { - currentPlayer().turnEnd(); + player().turnEnd(); player = ((player + 1) % 2); - currentPlayer().turnStart(); - hud.updatePlayer(); + player().turnStart(); + hud.nextTurn(); + } + + private void checkTurnEnd() + { + if (map.activatedPawnsCount() > 0) { + player().burnDownOneAp(); + hud.update(); + } + if (player().apExhausted()) + nextPlayer(); + } + public void endPlayerTurn() + { + state.abort(); + nextPlayer(); } public void setState(State.StateType state) @@ -146,21 +161,6 @@ public class Ctrl implements Disposable this.state.enter(normal); } - private void checkTurnEnd() - { - if (map.activatedPawnsCount() > 0) { - currentPlayer().burnDownOneAp(); - } - if (currentPlayer().apExhausted()) - nextPlayer(); - } - - public void endTurn() - { - state.abort(); - nextPlayer(); - } - public void abort() { state.abort(); |