From d86040d3e5395f91ed81a387260fb22f88ac63ed Mon Sep 17 00:00:00 2001 From: aah13002 Date: Wed, 20 Apr 2016 15:48:40 -0400 Subject: [PATCH] game class no longer uses Player --- src/controller/Game.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/controller/Game.java b/src/controller/Game.java index 9f70302..2ca5991 100755 --- a/src/controller/Game.java +++ b/src/controller/Game.java @@ -2,27 +2,14 @@ import model.Board; import model.Color; -import model.Player; public class Game { private Board board; - private Player player_one, player_two; + private Color current_turn; - public Game(Player p1, Player p2) { - this.player_one = p1; - this.player_two = p2; + public Game(Color start) { this.board = new Board(); - assignPieces(); - } - - private void assignPieces() { - if (player_one.getAssignedColor() == Color.RED) { - player_one.setPieces(board.getRedPieces()); - player_two.setPieces(board.getBlackPieces()); - } else { - player_two.setPieces(board.getRedPieces()); - player_one.setPieces(board.getBlackPieces()); - } + current_turn = start; } }