aaron/7not7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More work on undo/freemove buttons.

Browse Source
This commit is contained in:
t-moe
2016-06-17 13:37:45 +02:00
parent 38ec800137
commit fd287beb9d
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ch/bfh/sevennotseven/FieldCanvas.java
View File

@@ -69,9 +69,9 @@ public class FieldCanvas extends JPanel{
if(dst != null && src!=null && !src.equals(dst)) { if(dst != null && src!=null && !src.equals(dst)) {
System.out.println("Moving from "+src.toString()+ " to "+dst.toString()); System.out.println("Moving from "+src.toString()+ " to "+dst.toString());
game.doMove(src, dst); game.doMove(src, dst);
repaint();
} }
src = null; src = null;
repaint();
} }
}; };

2
src/ch/bfh/sevennotseven/Game.java
View File

@@ -394,7 +394,7 @@ public class Game {
field[lastPoint.x][lastPoint.y] = 0; field[lastPoint.x][lastPoint.y] = 0;
freeBlocks++; freeBlocks++;
if(distinctmatches < 1){ if(distinctmatches > 1){
freeMoves++; freeMoves++;
} }

10
src/ch/bfh/sevennotseven/Window.java
View File

@@ -54,8 +54,10 @@ public class Window extends JFrame {
moves.setPreferredSize(new Dimension(200, 40)); moves.setPreferredSize(new Dimension(200, 40));
buttonFreeMove= new JButton("FreeMove"); buttonFreeMove= new JButton("Free Move (0)");
buttonUndo = new JButton("Undo"); buttonFreeMove.setEnabled(false);
buttonUndo = new JButton("Undo (0)");
buttonUndo.setEnabled(false);
labelScore= new JLabel("Score: 0"); labelScore= new JLabel("Score: 0");
JPanel topPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); JPanel topPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
@@ -70,6 +72,10 @@ public class Window extends JFrame {
@Override @Override
public void gameUpdate() { public void gameUpdate() {
labelScore.setText("Score: "+game.getScore()); labelScore.setText("Score: "+game.getScore());
buttonFreeMove.setEnabled(game.getAvailFreeMoves()>0);
buttonUndo.setEnabled(game.getAvailUndo()>0);
buttonFreeMove.setText("Free Move ("+game.getAvailFreeMoves()+")");
buttonUndo.setText("Undo ("+game.getAvailUndo()+")");
} }
}); });