Fixed bugs

New Game button always lighting up
Undo button wrongly undoing score

Author: tpcstld

2048/2048/src/main/java/com/tpcstld/twozerogame/Grid.java

@@ -100,15 +100,13 @@ public void saveTiles() {
     }
 
     public void revertTiles() {
-        if (canUndo) {
-            canUndo = false;
-            for (int xx = 0; xx < undoField.length; xx++) {
-                for (int yy = 0; yy < undoField[0].length; yy++) {
-                    if (undoField[xx][yy] == null) {
-                        field[xx][yy] = null;
-                    } else {
-                        field[xx][yy] = new Tile(xx, yy, undoField[xx][yy].getValue());
-                    }
+        canUndo = false;
+        for (int xx = 0; xx < undoField.length; xx++) {
+            for (int yy = 0; yy < undoField[0].length; yy++) {
+                if (undoField[xx][yy] == null) {
+                    field[xx][yy] = null;
+                } else {
+                    field[xx][yy] = new Tile(xx, yy, undoField[xx][yy].getValue());
                 }
             }
         }

2048/2048/src/main/java/com/tpcstld/twozerogame/MainGame.java

@@ -52,12 +52,13 @@ public void newGame() {
             recordHighScore();
         }
         score = 0;
+        undoScore = 0;
         won = false;
         lose = false;
         addStartTiles();
         mView.refreshLastTime = true;
         mView.resyncTime();
-        mView.postInvalidate();
+        mView.invalidate();
     }
 
     public void addStartTiles() {
@@ -115,13 +116,15 @@ public void saveUndoState() {
     }
 
     public void revertUndoState() {
-        aGrid.cancelAnimations();
-        grid.revertTiles();
-        score = undoScore;
-        won = false;
-        lose = false;
-        mView.refreshLastTime = true;
-        mView.invalidate();
+        if (grid.canUndo) {
+            aGrid.cancelAnimations();
+            grid.revertTiles();
+            score = undoScore;
+            won = false;
+            lose = false;
+            mView.refreshLastTime = true;
+            mView.invalidate();
+        }
     }
 
     public void move (int direction) {
@@ -191,7 +194,7 @@ public void move (int direction) {
             checkLose();
         }
         mView.resyncTime();
-        mView.postInvalidate();
+        mView.invalidate();
     }
 
     public void checkLose() {

2048/2048/src/main/java/com/tpcstld/twozerogame/MainView.java

@@ -86,7 +86,7 @@ public void onDraw(Canvas canvas) {
         drawScoreText(canvas);
 
         if ((game.won || game.lose) && !game.aGrid.isAnimationActive()) {
-            drawNewGameButton(canvas);
+            drawNewGameButton(canvas, true);
         }
 
         drawCells(canvas);
@@ -169,8 +169,8 @@ public void drawScoreText(Canvas canvas) {
         canvas.drawText("" + game.score, sXScore + textMiddleScore, bodyStartYAll, paint);
     }
 
-    public void drawNewGameButton(Canvas canvas) {
-        if ((game.won || game.lose)) {
+    public void drawNewGameButton(Canvas canvas, boolean lightUp) {
+        if (lightUp) {
             drawDrawable(canvas, lightUpRectangle, sXNewGame, sYIcons, sXNewGame + iconSize, sYIcons + iconSize);
         } else {
             drawDrawable(canvas, backgroundRectangle, sXNewGame, sYIcons, sXNewGame + iconSize, sYIcons + iconSize);
@@ -334,7 +334,7 @@ public void createBackgroundBitmap(int width, int height) {
         background = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(background);
         drawHeader(canvas);
-        drawNewGameButton(canvas);
+        drawNewGameButton(canvas, false);
         drawUndoButton(canvas);
         drawBackground(canvas);
         drawBackgroundGrid(canvas);