push connerie romain
This commit is contained in:
parent
cdc0b2f381
commit
32ce167fe9
|
|
@ -34,10 +34,7 @@ public class Board {
|
|||
return isWhiteTurn;
|
||||
}
|
||||
|
||||
public void setPiece(boolean isWhite, PieceType type, int x, int y) {
|
||||
<<<<<<< HEAD
|
||||
//TODO
|
||||
=======
|
||||
public void setPiece(boolean isWhite, PieceType type, int x, int y) {
|
||||
for (int i = 0; i < pieces.size(); i++) {
|
||||
Piece p = pieces.get(i);
|
||||
if (p.getX() == x && p.getY() == y) {
|
||||
|
|
@ -46,8 +43,7 @@ public class Board {
|
|||
}
|
||||
}
|
||||
Piece newPiece = new Piece( x, y, type,isWhite);
|
||||
pieces.add(newPiece);
|
||||
>>>>>>> branch 'master' of https://gitarero.ecam.fr/celestin.bellanger/OOP_Groupe1A2_Project
|
||||
pieces.add(newPiece);
|
||||
}
|
||||
|
||||
public void populateBoard() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue