diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2016-03-07 15:40:04 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2016-03-07 15:40:04 +0100 |
| commit | d88c5cc130025eb2a0214436a86c15dad2787589 (patch) | |
| tree | 604355e533d9c5b7b316ddd4451c36498862436c /core/src/ch/asynk/rustanddust/game/battles | |
| parent | 6a87c1f59fd2fa379aeda871cf4535038756cb5e (diff) | |
| download | RustAndDust-d88c5cc130025eb2a0214436a86c15dad2787589.zip RustAndDust-d88c5cc130025eb2a0214436a86c15dad2787589.tar.gz | |
Player: remove id from constructor
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/battles')
3 files changed, 10 insertions, 8 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/battles/Battle00.java b/core/src/ch/asynk/rustanddust/game/battles/Battle00.java index 1ede61e..c3ea89f 100644 --- a/core/src/ch/asynk/rustanddust/game/battles/Battle00.java +++ b/core/src/ch/asynk/rustanddust/game/battles/Battle00.java @@ -25,10 +25,10 @@ public class Battle00 extends BattleCommon } @Override - protected void setPlayers(int idA, int idB) + protected void setPlayers() { - players[0] = factory.getPlayer(idA, Army.US); - players[1] = factory.getPlayer(idB, Army.GE); + players[0] = factory.getPlayer(Army.US); + players[1] = factory.getPlayer(Army.GE); } @Override diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java index f80d01f..0e6b00b 100644 --- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java @@ -32,7 +32,7 @@ public abstract class BattleCommon implements Battle protected abstract Player getWinner(); protected abstract void setupMap(); protected abstract void setupPlayer(); - protected abstract void setPlayers(int idA, int idB); + protected abstract void setPlayers(); private int d6() { @@ -73,7 +73,9 @@ public abstract class BattleCommon implements Battle public void init(Ctrl ctrl, int idA, int idB) { ctrl.map = this.map = factory.getMap(getMapType()); - setPlayers(idA, idB); + setPlayers(); + players[0].id = idA; + players[1].id = idB; setupMap(); diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java index d2279cb..8255722 100644 --- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java @@ -22,10 +22,10 @@ public class BattleTest extends BattleCommon } @Override - protected void setPlayers(int idA, int idB) + protected void setPlayers() { - players[0] = factory.getPlayer(idA, Army.GE); - players[1] = factory.getPlayer(idB, Army.US); + players[0] = factory.getPlayer(Army.GE); + players[1] = factory.getPlayer(Army.US); } @Override |