summaryrefslogtreecommitdiffstats
path: root/src/se
diff options
context:
space:
mode:
Diffstat (limited to 'src/se')
-rw-r--r--src/se/liu/gusso230/tetris/Board.java3
-rw-r--r--src/se/liu/gusso230/tetris/ImageComponent.java5
-rw-r--r--src/se/liu/gusso230/tetris/Point.java1
-rw-r--r--src/se/liu/gusso230/tetris/TetrisViewer.java2
4 files changed, 6 insertions, 5 deletions
diff --git a/src/se/liu/gusso230/tetris/Board.java b/src/se/liu/gusso230/tetris/Board.java
index 278ddf3..7e11c7a 100644
--- a/src/se/liu/gusso230/tetris/Board.java
+++ b/src/se/liu/gusso230/tetris/Board.java
@@ -29,6 +29,7 @@ public class Board {
private int points = 0;
private int lineStreak = 0;
private static final int LINE_STREAK_TARGET = 1;
+ private static final double TIMER_SPEEDUP = 0.95;
private HighscoreList highscores;
private File highscoreFile;
@@ -225,7 +226,7 @@ public class Board {
break;
}
if (linesCleared > 0) {
- timerDelay = (int) (timerDelay * 0.95);
+ timerDelay = (int) (timerDelay * TIMER_SPEEDUP);
timer.setDelay(timerDelay);
}
lineStreak += linesCleared;
diff --git a/src/se/liu/gusso230/tetris/ImageComponent.java b/src/se/liu/gusso230/tetris/ImageComponent.java
index 42a5449..2eae903 100644
--- a/src/se/liu/gusso230/tetris/ImageComponent.java
+++ b/src/se/liu/gusso230/tetris/ImageComponent.java
@@ -2,12 +2,13 @@ package se.liu.gusso230.tetris;
import javax.swing.*;
import java.awt.*;
+import java.net.URL;
public class ImageComponent extends JComponent {
private ImageIcon icon;
- public ImageComponent(String name) {
- icon = new ImageIcon(ClassLoader.getSystemResource(name));
+ public ImageComponent(URL url) {
+ icon = new ImageIcon(url);
}
public void paintComponent(final Graphics g) {
diff --git a/src/se/liu/gusso230/tetris/Point.java b/src/se/liu/gusso230/tetris/Point.java
index 139f155..e802f26 100644
--- a/src/se/liu/gusso230/tetris/Point.java
+++ b/src/se/liu/gusso230/tetris/Point.java
@@ -34,7 +34,6 @@ public class Point {
* @param boundingBoxSize the size of the bounding box this point should be rotated with respect to.
*/
public void rotateCounterClockwise(int boundingBoxSize) {
- //TODO better logic
rotateClockwise(boundingBoxSize);
rotateClockwise(boundingBoxSize);
rotateClockwise(boundingBoxSize);
diff --git a/src/se/liu/gusso230/tetris/TetrisViewer.java b/src/se/liu/gusso230/tetris/TetrisViewer.java
index bb65734..3cfed8d 100644
--- a/src/se/liu/gusso230/tetris/TetrisViewer.java
+++ b/src/se/liu/gusso230/tetris/TetrisViewer.java
@@ -12,7 +12,7 @@ public class TetrisViewer {
public TetrisViewer(final Board board) {
menuBar = setUpMenuBar();
- imageComponent = new ImageComponent("images/hello_world.png");
+ imageComponent = new ImageComponent(ClassLoader.getSystemResource("images/hello_world.png"));
tetrisComponent = new TetrisComponent(board);
this.board = board;
board.addListener(tetrisComponent);