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