From c95a74ec7b5954881bad3a1c6e0a4fa3a1f4b645 Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Sun, 16 Nov 2014 13:22:23 +0100
Subject: Battle: getFirstPlayer(), getSecondPlayer() -> getPlayer(boolean
 first, boolean deploymentPhase)

---
 core/src/ch/asynk/tankontank/game/battles/BattleCommon.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'core/src/ch/asynk/tankontank/game/battles')

diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java
index 48934115..49e9d8de 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)
-- 
cgit v1.2.3