Commits

Miki Tebeka  committed c7e0b5e

Collapsing works

  • Participants
  • Parent commits 62ead31

Comments (0)

Files changed (1)

     return pack;
 }
 
+var DEBUG=0;
 function push_down(row, col) {
-    while (row > NUM_ROWS) {
-        if (cell_color(row +1, col) == BLANK) {
-            cell_color(row +1, col, cell_color(row, col));
-            cell_color(row, col, BLANK);
-            row = row - 1;
-        }
-        else {
-            break;
-        }
+    while ((row < NUM_ROWS - 1) && cell_color(row + 1, col) == BLANK) {
+        cell_color(row + 1, col, cell_color(row, col));
+        cell_color(row, col, BLANK);
+        ++row;
     }
 }
 
 function collapse() {
     for (var col = 0; col < NUM_COLS; ++col) {
-        for (var row = NUM_ROWS - 2; row >= 0; --row) {
-            if (cell_color(row + 1, col) == BLANK) {
-                push_down(row, col);
-            }
+        for (var row = NUM_ROWS - 1; row >= 0; --row) {
+            push_down(row, col);
         }
     }
 }
 
 function on_click(row, col) {
+    if (cell_color(row, col) == BLANK) {
+        return;
+    }
+
     var pack = same_color_pack(row, col);
     if (pack.length < 2) {
         return;