From 123a42ff4c9866d4dee570c96437cc3495d3d4f8 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Wed, 12 Nov 2014 23:29:05 +0100 Subject: BattleCommon: add getFirstPlayer() and getSecondPlayer() --- core/src/ch/asynk/tankontank/game/battles/BattleCommon.java | 10 ++++++++++ .../ch/asynk/tankontank/game/battles/BattleHeadToHead.java | 12 ------------ 2 files changed, 10 insertions(+), 12 deletions(-) (limited to 'core/src') diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java index c39b2b4f..328b4d05 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 fefc1d2b..5b7b0f3a 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java @@ -63,18 +63,6 @@ public class BattleHeadToHead extends BattleCommon return factory.getMap(Factory.MapType.MAP_A); } - @Override - public Player getFirstPlayer() - { - return factory.getPlayer(firstArmy); - } - - @Override - public Player getSecondPlayer() - { - return factory.getPlayer(secondArmy); - } - @Override public StateType getState(Player player) { -- cgit v1.2.3