redovisning

5 files changed, 6 insertions, 19 deletions

diff --git a/src/se/liu/gusso230/tetris/Board.java b/src/se/liu/gusso230/tetris/Board.java
index 0ff4a84..f31c585 100644
--- a/src/se/liu/gusso230/tetris/Board.java
+++ b/src/se/liu/gusso230/tetris/Board.java
@@ -28,7 +28,7 @@ public class Board {
     private int fallingY;
     private int points = 0;
     private int lineStreak = 0;
-    private static final int LINE_STREAK_TARGET = 1;
+    private static final int LINE_STREAK_TARGET = 4;
     private static final double TIMER_SPEEDUP = 0.95;
 
     private HighscoreList highscores;
diff --git a/src/se/liu/gusso230/tetris/BoardListener.java b/src/se/liu/gusso230/tetris/BoardListener.java
index 34d8352..7ed7380 100644
--- a/src/se/liu/gusso230/tetris/BoardListener.java
+++ b/src/se/liu/gusso230/tetris/BoardListener.java
@@ -2,4 +2,5 @@ package se.liu.gusso230.tetris;
 
 public interface BoardListener {
     public void boardChanged();
+    //public void onGameOver(); //TODO
 }
diff --git a/src/se/liu/gusso230/tetris/Heavy.java b/src/se/liu/gusso230/tetris/Heavy.java
index 4f7700c..85666b6 100644
--- a/src/se/liu/gusso230/tetris/Heavy.java
+++ b/src/se/liu/gusso230/tetris/Heavy.java
@@ -3,21 +3,7 @@ package se.liu.gusso230.tetris;
 public class Heavy implements FallHandler {
     @Override public boolean hasFallingCollision(final Board board, final int dx, final int dy) {
         if (dx != 0) {
-            return new DefaultFallHandler().hasFallingCollision(board, dx, dy);
-        }
-
-        boolean emptyUnderAll = true;
-        for (Point point: board.getFalling().getPoints()) {
-            int x = board.getFallingX() + point.getX();
-            int y = board.getFallingY() + point.getY();
-
-            if (board.getSquareAt(x, y, false) != SquareType.EMPTY) {
-                emptyUnderAll = false;
-                break;
-            }
-        }
-        if (emptyUnderAll) {
-            return false;
+            return new DefaultFallHandler().hasFallingCollision(board, dx, dy); //inget new
         }
 
         for (Point point: board.getFalling().getPoints()) {
diff --git a/src/se/liu/gusso230/tetris/TetrisComponent.java b/src/se/liu/gusso230/tetris/TetrisComponent.java
index 79f34b2..f5720f1 100644
--- a/src/se/liu/gusso230/tetris/TetrisComponent.java
+++ b/src/se/liu/gusso230/tetris/TetrisComponent.java
@@ -47,7 +47,7 @@ public class TetrisComponent extends JComponent implements BoardListener {
             board.move(dir);
         }
     }
-
+    //TODO join move and rotate
     private class RotateAction extends AbstractAction {
         private Direction dir;
         private RotateAction(Direction dir) {
diff --git a/src/se/liu/gusso230/tetris/TetrisViewer.java b/src/se/liu/gusso230/tetris/TetrisViewer.java
index 3cfed8d..fb824f9 100644
--- a/src/se/liu/gusso230/tetris/TetrisViewer.java
+++ b/src/se/liu/gusso230/tetris/TetrisViewer.java
@@ -12,10 +12,10 @@ public class TetrisViewer {
 
     public TetrisViewer(final Board board) {
         menuBar = setUpMenuBar();
-        imageComponent = new ImageComponent(ClassLoader.getSystemResource("images/hello_world.png"));
+        imageComponent = new ImageComponent(ClassLoader.getSystemResource("images/hello_world.png")); //TODO arg
         tetrisComponent = new TetrisComponent(board);
         this.board = board;
-        board.addListener(tetrisComponent);
+        board.addListener(tetrisComponent); //TODO move
     }
 
     private JMenuBar setUpMenuBar() {