diff --git a/src/main/java/com/billenius/schack/boards/Board.java b/src/main/java/com/billenius/schack/boards/Board.java
index 6ee0971..4d74e81 100644
--- a/src/main/java/com/billenius/schack/boards/Board.java
+++ b/src/main/java/com/billenius/schack/boards/Board.java
@@ -95,6 +95,10 @@ public abstract class Board extends JPanel implements MouseListener {
g2.fillOval(validMove.x * SIZE_OF_TILE, validMove.y * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE);
}
+ if (turnCount > 0) {
+ boolean b = true;
+ }
+
// Måla alla pjäser
for (Piece[] pieceArr : pieces)
for (Piece piece : pieceArr) {
@@ -143,11 +147,6 @@ public abstract class Board extends JPanel implements MouseListener {
if (!validMovesToDraw.contains(clickedCoordinate)) {
Piece selectedPiece = pieces[clickedCoordinate.x][clickedCoordinate.y];
toDoIfNoPreviousPieceSelected(selectedPiece);
- if (selectedPiece != null && selectedPiece.isWhite() == whitesTurn)
- validMovesToDraw.addAll(selectedPiece.validMoves(pieces, true));
- else
- validMovesToDraw = new ArrayList<>(); // Snabbare än .clear
-
} else
validMovesToDraw = new ArrayList<>(); // Snabbare än .clear
diff --git a/src/main/java/com/billenius/schack/boards/NetworkBoard.java b/src/main/java/com/billenius/schack/boards/NetworkBoard.java
index 154eba0..dcd0c67 100644
--- a/src/main/java/com/billenius/schack/boards/NetworkBoard.java
+++ b/src/main/java/com/billenius/schack/boards/NetworkBoard.java
@@ -41,16 +41,17 @@ public final class NetworkBoard extends Board {
options,
options[0]);
+ // Nu ska vi bli en Server
if (choosenOption == 0) {
- String ip = Inet4Address.getLocalHost().toString();
+ String ip = Inet4Address.getLocalHost().getHostAddress();
final JFrame frame = new JFrame("Schack: Networking");
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
JPanel panel = new JPanel(new BorderLayout());
- panel.setPreferredSize(new Dimension(200, 200));
+ panel.setPreferredSize(new Dimension(600, 200));
JLabel loading = new JLabel(
- "Waiting for opponent to connect...\nYour ip is " + ip + " Listening on port 1339");
+ "Waiting for opponent to connect...
Listening on " + ip + ":1339");
loading.setFont(new Font("Cantarell", Font.PLAIN, 24));
loading.setHorizontalAlignment(JLabel.CENTER);
@@ -61,7 +62,7 @@ public final class NetworkBoard extends Board {
serverSocket = new ServerSocket(1339);
this.socket = serverSocket.accept();
// myColor = new Random().nextBoolean();
- myColor = true;
+ myColor = true; // VIT
frame.setVisible(false);
// Get input/output stream
@@ -69,13 +70,15 @@ public final class NetworkBoard extends Board {
inputStream = new ObjectInputStream(socket.getInputStream());
System.out.println("Getting outputstream");
outputStream = new ObjectOutputStream(socket.getOutputStream());
- } else {
+ }
+ // Nu ska vi bli en klient
+ else {
String ip = JOptionPane.showInputDialog(null,
"What's the IP of your opponent?",
"Schack: Networking",
JOptionPane.QUESTION_MESSAGE);
this.socket = new Socket("localhost", 1339);
- myColor = false;
+ myColor = false; // SVART
// Get input/output stream
System.out.println("Getting outputstream");
@@ -88,8 +91,8 @@ public final class NetworkBoard extends Board {
@Override
protected void makeMove(Move move) {
try {
+ turnCount++;
moveList.addElement(move);
-
move.movedPiece.move(pieces, move.to);
getParent().repaint();
outputStream.writeObject(move);
@@ -117,6 +120,7 @@ public final class NetworkBoard extends Board {
move = (Move) inputStream.readObject();
moveList.addElement(move);
+ turnCount++;
System.out.println(move);
pieces[move.from.x][move.from.y].move(pieces, move.to);