diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-12 23:29:05 +0100 | 
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-12 23:29:05 +0100 | 
| commit | 123a42ff4c9866d4dee570c96437cc3495d3d4f8 (patch) | |
| tree | ead1b309fec7a470ef85fcf1a3245b270df97265 /core/src | |
| parent | 10a1b41a728f56b3846e708488b8dcef03844eb3 (diff) | |
| download | RustAndDust-123a42ff4c9866d4dee570c96437cc3495d3d4f8.zip RustAndDust-123a42ff4c9866d4dee570c96437cc3495d3d4f8.tar.gz | |
BattleCommon: add getFirstPlayer() and getSecondPlayer()
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/battles/BattleCommon.java | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java | 12 | 
2 files changed, 10 insertions, 12 deletions
| diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java index c39b2b4..328b4d0 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java @@ -51,6 +51,16 @@ public abstract class BattleCommon implements Battle          }      } +    public Player getFirstPlayer() +    { +        return factory.getPlayer(firstArmy); +    } + +    public Player getSecondPlayer() +    { +        return factory.getPlayer(secondArmy); +    } +      public void addEntryPoint(EntryPoint entry)      {          entryPoints.add(entry); diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java index fefc1d2..5b7b0f3 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java @@ -64,18 +64,6 @@ public class BattleHeadToHead extends BattleCommon      }      @Override -    public Player getFirstPlayer() -    { -        return factory.getPlayer(firstArmy); -    } - -    @Override -    public Player getSecondPlayer() -    { -        return factory.getPlayer(secondArmy); -    } - -    @Override      public StateType getState(Player player)      {          return StateType.SELECT; | 
