From 53d03abf8eb4fb7917e81aa2dc024e7eaecb85c1 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 15 Feb 2014 09:55:31 +0100 Subject: [PATCH] Cleanup --- bin/classes/mangavalk/tetris/CanvasView.class | Bin 32571 -> 32571 bytes src/mangavalk/tetris/CanvasView.java | 61 +----------------- 2 files changed, 1 insertion(+), 60 deletions(-) diff --git a/bin/classes/mangavalk/tetris/CanvasView.class b/bin/classes/mangavalk/tetris/CanvasView.class index 34d4cda758a4eeb71c2855c98ce06dcc2f8e7733..f7b24c6ead8f637dd9bd9aae66879e86e38eed8d 100644 GIT binary patch delta 3911 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 Hnx62#SmXOp delta 3911 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 28 && moveX <= 55 && moveY >= 143 && moveY <= 155) // Menu { - //GamePlaying = !GamePlaying; if (GamePlaying) onPause(); else @@ -1250,15 +1222,6 @@ public class CanvasView extends View if (!goingDown) { - // Infinite swing - /*if (NextWillLock) - { - handler.removeCallbacksAndMessages(null); - int newSpeed = (int)((1000 / 59.73) * LevelSpeed[_level]); - handler.postDelayed(runnable, newSpeed); - NextWillLock = false; - }*/ - if (GamePlaying) { if (!GameOver) @@ -1340,11 +1303,6 @@ public class CanvasView extends View } else { - /*if (NextWillLock) - {*/ - /*int newSpeed = (int)((1000 / 59.73) * LevelSpeed[level]); - handler.postDelayed(runnable, newSpeed);*/ - NextWillLock = false; ParseBlockArrayToDrawArray(); @@ -1364,13 +1322,6 @@ public class CanvasView extends View { this.postInvalidate(); } - /*} - else - { - NextWillLock = true; - handler.removeCallbacksAndMessages(null); - handler.postDelayed(TimeoutDown, 3000); - }*/ } goingDown = false; @@ -1444,11 +1395,8 @@ public class CanvasView extends View { for (int y=17; y>0; y--) { - /*if (blockArray[y-1][x] != 0) - {*/ blockArray[y][x] = blockArray[y-1][x]; blockArray[y-1][x] = 0; - //} } } } @@ -1459,11 +1407,8 @@ public class CanvasView extends View { for (int x=1; x<10; x++) { - /*if (blockArray[y][x-1] == 0) - {*/ blockArray[y][x-1] = blockArray[y][x]; blockArray[y][x] = 0; - //} } } } @@ -1474,11 +1419,8 @@ public class CanvasView extends View { for (int x=8; x>=0; x--) { - /*if (blockArray[y][x-1] == 0) - {*/ blockArray[y][x+1] = blockArray[y][x]; blockArray[y][x] = 0; - //} } } } @@ -1842,7 +1784,6 @@ public class CanvasView extends View paint.setColor(Color); paint.setStyle(Style.FILL); - // Style Square canvas.drawRect( GetRealPixelSize(DIP_W, dpWidth, Left), GetRealPixelSize(DIP_H, dpHeight, Top),