undo last merge
parent
724cde3fd0
commit
d5cfa77e09
|
|
@ -238,43 +238,14 @@ public class SpielFrame extends JFrame {
|
||||||
|
|
||||||
selectables = game.getLegalMoveableSquares(selectedSquare);
|
selectables = game.getLegalMoveableSquares(selectedSquare);
|
||||||
|
|
||||||
for (
|
for (Square square : selectables) {
|
||||||
|
|
||||||
Square square : selectables) {
|
|
||||||
JButton b = buttons.get(mirrowedGrid(square.ordinal()));
|
JButton b = buttons.get(mirrowedGrid(square.ordinal()));
|
||||||
final Move move = new Move(selectedSquare, square);
|
final Move move = new Move(selectedSquare, square);
|
||||||
b.setEnabled(true);
|
b.setEnabled(true);
|
||||||
b.setBackground(new Color(230, 100, 100));
|
b.setBackground(new Color(230, 100, 100));
|
||||||
for (ActionListener al : b.getActionListeners()) {
|
b.addActionListener(new ButtonMovePieceListener(this, this.game, move));
|
||||||
b.removeActionListener(al);
|
|
||||||
}
|
}
|
||||||
b.addActionListener(new ActionListener() {
|
|
||||||
@Override
|
|
||||||
public void actionPerformed(ActionEvent e) {
|
|
||||||
if(game.isPromotionMove(move)) {
|
|
||||||
game.doPromotionMove(showPromotion(), selectedSquare, square);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
game.playMove(move);
|
|
||||||
}
|
|
||||||
if (game.isDraw()) {
|
|
||||||
game.stopClock();
|
|
||||||
mode = BoardMode.finished;
|
|
||||||
showDraw();
|
|
||||||
} else if (game.isMate()) {
|
|
||||||
game.stopClock();
|
|
||||||
mode = BoardMode.finished;
|
|
||||||
showWin(game.getActivePlayer());
|
|
||||||
}
|
|
||||||
mode = BoardMode.normal;
|
|
||||||
setCursor(null);
|
|
||||||
erstelleBrett();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case finished:
|
case finished:
|
||||||
clearButtons();
|
clearButtons();
|
||||||
break;
|
break;
|
||||||
|
|
@ -323,8 +294,7 @@ public class SpielFrame extends JFrame {
|
||||||
dialog.setLayout(new GridLayout(2, 2));
|
dialog.setLayout(new GridLayout(2, 2));
|
||||||
dialog.setSize(300, 200);
|
dialog.setSize(300, 200);
|
||||||
|
|
||||||
int[] pictures = {81, 82, 66, 78, 113, 114, 98, 110};
|
int[] pictures = { 81, 82, 66, 78, 113, 114, 98, 110 };
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
int index = (game.getActivePlayer() - 1) * 4 + i;
|
int index = (game.getActivePlayer() - 1) * 4 + i;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue