fvj
This commit is contained in:
parent
ba441cc3da
commit
8cc09e2347
|
|
@ -280,7 +280,7 @@ public class Board {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isPieceSelected() {
|
public boolean isPieceSelected() {
|
||||||
if (selectedX != -1 && selectedY != -1 /*&& board[selectedY][selectedX] != null*/) {
|
if (selectedX != -1 && selectedY != -1) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -322,7 +322,6 @@ public class Board {
|
||||||
if (enPassant) {
|
if (enPassant) {
|
||||||
secondPieceCoord[0] = clickedX;
|
secondPieceCoord[0] = clickedX;
|
||||||
secondPieceCoord[1] = clickedY;
|
secondPieceCoord[1] = clickedY;
|
||||||
//move.setEnPassant(enPassant);
|
|
||||||
}
|
}
|
||||||
playMove(move);
|
playMove(move);
|
||||||
turns += 1;
|
turns += 1;
|
||||||
|
|
@ -390,16 +389,10 @@ public class Board {
|
||||||
|
|
||||||
public boolean isHighlighted(int x, int y, Board board2) {
|
public boolean isHighlighted(int x, int y, Board board2) {
|
||||||
if (isPieceSelected()) {
|
if (isPieceSelected()) {
|
||||||
//boolean king = hasPieceMoved(PieceType.King, whiteTurn, true);
|
|
||||||
//boolean rookRight = hasPieceMoved(PieceType.Rook, whiteTurn, true);
|
|
||||||
//boolean rookLeft = hasPieceMoved(PieceType.Rook, whiteTurn, false);
|
|
||||||
Piece selectedPiece = board[selectedY][selectedX];
|
Piece selectedPiece = board[selectedY][selectedX];
|
||||||
moveCalc = new MoveCalculator(board2);
|
moveCalc = new MoveCalculator(board2);
|
||||||
ArrayList<int[]> moves = moveCalc.getMove(selectedPiece.getType(), selectedPiece.isWhite(), selectedX, selectedY);
|
ArrayList<int[]> moves = moveCalc.getMove(selectedPiece.getType(), selectedPiece.isWhite(), selectedX, selectedY);
|
||||||
//this.castlingLeft = moveCalc.getCastlingLeft();
|
|
||||||
castlingRight = moveCalc.getCastlingRight();
|
castlingRight = moveCalc.getCastlingRight();
|
||||||
//this.enPassantX = moveCalc.getEnPassantX();
|
|
||||||
//this.enPassantY = moveCalc.getEnPassantY();
|
|
||||||
for (int i = 0; i < moves.size(); i++) {
|
for (int i = 0; i < moves.size(); i++) {
|
||||||
if (x == moves.get(i)[0] && y == moves.get(i)[1]) {
|
if (x == moves.get(i)[0] && y == moves.get(i)[1]) {
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -484,7 +477,6 @@ public class Board {
|
||||||
}
|
}
|
||||||
|
|
||||||
public Board(Piece[][] board) {
|
public Board(Piece[][] board) {
|
||||||
//Piece[][] newBoard = new Piece[lineNum][colNum];
|
|
||||||
for (int i = 0; i < colNum; i++) {
|
for (int i = 0; i < colNum; i++) {
|
||||||
for (int j = 0; j < lineNum; j++) {
|
for (int j = 0; j < lineNum; j++) {
|
||||||
piece = board[j][i];
|
piece = board[j][i];
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue