From 24aa37a7490ea1038571277754ba6492af3b97b1 Mon Sep 17 00:00:00 2001
From: lov3b <lovebillenius@protonmail.com>
Date: Sun, 15 May 2022 19:42:33 +0200
Subject: [PATCH] =?UTF-8?q?Niklasifierat=20kod=20+=20optimerat=20drawSquar?=
 =?UTF-8?q?es=20+=20soppat=20bort=20skr=C3=A4p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/schack/Board.java | 40 +++++++++++++++++++---------------------
 src/schack/Pawn.java  |  1 -
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/schack/Board.java b/src/schack/Board.java
index f2d7a69..ea2f483 100644
--- a/src/schack/Board.java
+++ b/src/schack/Board.java
@@ -53,10 +53,6 @@ public class Board extends JPanel implements MouseListener {
             {new Rook(false, new Point(7, 0)), null, null, null, null, null, null, new Rook(true, new Point(7, 7))}
         };
 
-        // Test 
-        piecesRet[2][2] = null;
-        piecesRet[2][3] = null;
-
         // Sätt ut bönder
         for (int i = 0; i < pieces.length; i++) {
             piecesRet[i][1] = new Pawn(false, new Point(i, 1));
@@ -71,17 +67,24 @@ public class Board extends JPanel implements MouseListener {
         Graphics2D g2 = (Graphics2D) g;
         drawSquares(g2);
 
-        // måla alla ställen man kan gå¨till
-        validMovesToDraw.stream().filter(point -> point != null)
-                .forEach(point -> {
-                    g2.setColor(moveableColor);
-                    g2.fillOval(point.x * SIZE_OF_TILE, point.y * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE);
-                });
+        // Måla alla ställen man kan gå till
+        g2.setColor(moveableColor);
+        for (Point validMove : validMovesToDraw) {
+            if (validMove == null) {
+                continue;
+            }
+            g2.fillOval(validMove.x * SIZE_OF_TILE, validMove.y * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE);
+        }
 
-        // Draw piece
-        Arrays.stream(pieces).forEach(pieceArr -> Arrays.stream(pieceArr)
-                .filter(piece -> piece != null)
-                .forEach(piece -> piece.draw(g2)));
+        // Måla alla pjäser
+        for (Piece[] pieceArr : pieces) {
+            for (Piece piece : pieceArr) {
+                if (piece == null) {
+                    continue;
+                }
+                piece.draw(g2);
+            }
+        }
     }
 
     private void drawSquares(Graphics2D g2) {
@@ -90,13 +93,8 @@ public class Board extends JPanel implements MouseListener {
 
         for (int i = 0; i < 8; i += 2) {
             for (int j = 0; j < 8; j += 2) {
-                g2.fillRect(i * SIZE_OF_TILE, j * SIZE_OF_TILE, 1 * SIZE_OF_TILE, 1 * SIZE_OF_TILE);
-            }
-        }
-
-        for (int i = 1; i < 8; i += 2) {
-            for (int j = 1; j < 8; j += 2) {
-                g2.fillRect(i * SIZE_OF_TILE, j * SIZE_OF_TILE, 1 * SIZE_OF_TILE, 1 * SIZE_OF_TILE);
+                g2.fillRect(i * SIZE_OF_TILE, j * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE);
+                g2.fillRect((i + 1) * SIZE_OF_TILE, (j + 1) * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE);
             }
         }
     }
diff --git a/src/schack/Pawn.java b/src/schack/Pawn.java
index a3beb43..e001a2d 100644
--- a/src/schack/Pawn.java
+++ b/src/schack/Pawn.java
@@ -79,7 +79,6 @@ public class Pawn extends PieceKnownIfMoved {
         if (pos.x >= pieces.length || pos.x < 0 || pos.y >= pieces[0].length || pos.y < 0) {
             return movable;
         }
-
         final Piece potentialEnemy = pieces[pos.x][pos.y];
         // Ifall det är tomt här, gör ingenting
         if (potentialEnemy != null && potentialEnemy.isWhite() != this.isWhite()) {