Mercurial > hg > ristipolku

changeset 56:8718cc1c6586

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor bugfixes.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 23 Feb 2011 20:31:39 +0200
parents 974ec36c562e
children 1435e9d7fd1a
files game/Engine.java
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/game/Engine.java	Wed Feb 23 20:16:26 2011 +0200
+++ b/game/Engine.java	Wed Feb 23 20:31:39 2011 +0200
@@ -151,10 +151,13 @@
     
     public void pieceSwapCurrent()
     {
-        Piece tmp = currPiece;
-        currPiece = nextPiece;
-        nextPiece = tmp;
-        board[currX][currY] = currPiece;
+        if (!flagGameOver)
+        {
+            Piece tmp = currPiece;
+            currPiece = nextPiece;
+            nextPiece = tmp;
+            board[currX][currY] = currPiece;
+        }
     }
     
     public boolean pieceCheck(Piece piece)
@@ -162,7 +165,7 @@
         if (piece == null)
         {
             // Create new piece
-            currPiece = new Piece(PieceType.ACTIVE);
+            pieceCreateNew();
             board[currX][currY] = currPiece;
             return true;
         }
@@ -305,7 +308,7 @@
                 System.out.print("Could not initialize fonts.\n");
             }
             
-            musa = soundManager.getSound("sounds/gamemusic.wav");
+//            musa = soundManager.getSound("sounds/gamemusic.wav");
         }
         catch (IOException e)
         {