diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-16 13:22:23 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-16 13:22:23 +0100 |
| commit | c95a74ec7b5954881bad3a1c6e0a4fa3a1f4b645 (patch) | |
| tree | 1d98dd3e41f9c3d4b80b910bfbaa29b68524668f /core/src/ch/asynk/tankontank/game/battles | |
| parent | c2126e98a99dd5aeddf45c02ef193d26279ddd7b (diff) | |
| download | RustAndDust-c95a74ec7b5954881bad3a1c6e0a4fa3a1f4b645.zip RustAndDust-c95a74ec7b5954881bad3a1c6e0a4fa3a1f4b645.tar.gz | |
Battle: getFirstPlayer(), getSecondPlayer() -> getPlayer(boolean first, boolean deploymentPhase)
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/battles')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/battles/BattleCommon.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java index 4893411..49e9d8d 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java @@ -56,14 +56,9 @@ public abstract class BattleCommon implements Battle } } - public Player getFirstPlayer() + public Player getPlayer(boolean first, boolean deploymentPhase) { - return factory.getPlayer(firstArmy); - } - - public Player getSecondPlayer() - { - return factory.getPlayer(secondArmy); + return factory.getPlayer((first ? firstArmy : secondArmy)); } public EntryPoint getEntryPoint(Unit unit) |