kske/chess
Archived
1
Fork 0
Code Issues 6 Pull Requests Releases 5 Activity

Fixed Game and Log synchronization on FEN loading

Browse Source
This commit is contained in:
Kai S. K. Engelbart 2019-08-13 05:59:47 +02:00
parent 17f110e7f7
commit dcef49c4eb
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dev/kske/chess/board/Log.java
View File

@ -45,19 +45,10 @@ public class Log implements Cloneable {
* @param pawnMove {@code true} if the move was made by a pawn * @param pawnMove {@code true} if the move was made by a pawn
*/ */
public void add(Move move, Piece capturedPiece, boolean pawnMove) { public void add(Move move, Piece capturedPiece, boolean pawnMove) {
// En passant availability
enPassant = pawnMove && move.yDist == 2 ? new Position(move.pos.x, move.pos.y + move.ySign) : null; enPassant = pawnMove && move.yDist == 2 ? new Position(move.pos.x, move.pos.y + move.ySign) : null;
if (activeColor == Color.BLACK) ++fullmoveCounter;
// Fullmove counter and halfmove clock if (pawnMove || capturedPiece != null) halfmoveClock = 0;
int fullmoveCounter, halfmoveClock; else++halfmoveClock;
if (moves.isEmpty()) {
fullmoveCounter = 1;
halfmoveClock = 0;
} else {
fullmoveCounter = getLast().fullmoveCounter;
if (activeColor == Color.BLACK) ++fullmoveCounter;
halfmoveClock = capturedPiece != null || pawnMove ? 0 : getLast().halfmoveClock + 1;
}
activeColor = activeColor.opposite(); activeColor = activeColor.opposite();
moves.add(new LoggedMove(move, capturedPiece, enPassant, activeColor, fullmoveCounter, halfmoveClock)); moves.add(new LoggedMove(move, capturedPiece, enPassant, activeColor, fullmoveCounter, halfmoveClock));
} }

5
src/dev/kske/chess/ui/MenuBar.java
View File

@ -90,7 +90,10 @@ public class MenuBar extends JMenuBar {
.getBoard() .getBoard()
.initFromFEN(JOptionPane.showInputDialog("Enter a FEN string: ")); .initFromFEN(JOptionPane.showInputDialog("Enter a FEN string: "));
mainWindow.getBoardPane().getBoardComponent().repaint(); mainWindow.getBoardPane().getBoardComponent().repaint();
mainWindow.getGame()
.getPlayers()
.get(mainWindow.getGame().getBoard().getLog().getActiveColor())
.requestMove();
}); });
toolsMenu.add(loadFromFENMenuItem); toolsMenu.add(loadFromFENMenuItem);