Changeset 258Tweet

Timestamp:

Jan 21, 2011, 2:52:05 PM (9 years ago)

Author:

sam

Message:

Implement valid move checks and early piece disappearance.

Location:

trunk/monsterz

Files:

• board.cpp (modified) (2 diffs)
• board.h (modified) (1 diff)
• piece.cpp (modified) (2 diffs)
• piece.h (modified) (1 diff)

trunk/monsterz/board.cpp

@@ -143 +143 @@
                   - data->grabbed->GetPos()).sqlen() > 100 * 100)
         {
+            data->grabbed->Ungrab();
             if (data->dst_cell != Int2(-1))
-            {
-                Piece *src = data->pieces[data->src_cell.i][data->src_cell.j];
-                Piece *dst = data->pieces[data->dst_cell.i][data->dst_cell.j];
-                data->pieces[data->src_cell.i][data->src_cell.j] = dst;
-                data->pieces[data->dst_cell.i][data->dst_cell.j] = src;
-                src->SetCell(data->dst_cell);
-                src->Goto(data->dst_cell * 48);
-                dst->SetCell(data->src_cell);
-                dst->Goto(data->src_cell * 48);
-            }
-            data->grabbed->Ungrab();
+                Switch(data->src_cell, data->dst_cell);
             data->state = BoardData::IDLE;
         }
@@ -181 +172 @@
         data->game->GetScene()->AddTile((data->tiles << 16) | 7, x, y, 10, 0);
     }
+}
+
+void Board::Switch(Int2 cell_a, Int2 cell_b)
+{
+    Piece *a = data->pieces[cell_a.i][cell_a.j];
+    Piece *b = data->pieces[cell_b.i][cell_b.j];
+    data->pieces[cell_a.i][cell_a.j] = b;
+    data->pieces[cell_b.i][cell_b.j] = a;
+
+    /* Check whether this is a valid move by testing all patterns.
+     * If the move is invalid, cancel the swap and bail out */
+    int list[8][8];
+
+    if (!ListMashes(list))
+    {
+        data->pieces[cell_a.i][cell_a.j] = a;
+        data->pieces[cell_b.i][cell_b.j] = b;
+        a->Goto(cell_a * 48);
+        b->Goto(cell_b * 48);
+        return;
+    }
+
+    /* Perform the swap */
+    a->SetCell(cell_b);
+    a->Goto(cell_b * 48);
+    b->SetCell(cell_a);
+    b->Goto(cell_a * 48);
+
+    /* Remove matching tiles */
+    do for (int j = 8; j--;) for (int i = 0; i < 8; i++)
+    {
+        if (list[i][j])
+        {
+            Ticker::Unref(data->pieces[i][j]);
+            for (int j2 = j + 1; j2 < 8; j2++)
+            {
+                data->pieces[i][j2 - 1] = data->pieces[i][j2];
+                data->pieces[i][j2 - 1]->SetCell(Int2(i, j2 - 1));
+                data->pieces[i][j2 - 1]->Goto(Int2(i, j2 - 1) * 48);
+                list[i][j2 - 1] = list[i][j2];
+            }
+            data->pieces[i][7] = new Piece(data->game, Int2(i, 7), 25 + 5 * (rand() % 8));
+            Ticker::Ref(data->pieces[i][7]);
+            list[i][7] = 0;
+        }
+    }
+    while(ListMashes(list));
+}
+
+int Board::ListMashes(int list[8][8])
+{
+    int ret = 0;
+
+    for (int j = 0; j < 8; j++)
+        for (int i = 0; i < 8; i++)
+            list[i][j] = 0;
+
+    for (int j = 0; j < 8; j++)
+        for (int i = 0; i < 8; i++)
+        {
+            int id = data->pieces[i][j]->GetId();
+
+            if (i + 2 < 8 && data->pieces[i + 1][j]->GetId() == id
+                          && data->pieces[i + 2][j]->GetId() == id)
+            {
+                list[i][j] = list[i + 1][j] = list[i + 2][j] = 1;
+                ret = 1;
+            }
+
+            if (j + 2 < 8 && data->pieces[i][j + 1]->GetId() == id
+                          && data->pieces[i][j + 2]->GetId() == id)
+            {
+                list[i][j] = list[i][j + 1] = list[i][j + 2] = 1;
+                ret = 1;
+            }
+        }
+
+    return ret;
 }
 

trunk/monsterz/board.h

@@ -27 +27 @@
     virtual void TickDraw(float deltams);
 
+    void Switch(Int2 cell_a, Int2 cell_b);
+    int ListMashes(int list[8][8]);
+
 private:
     BoardData *data;

trunk/monsterz/piece.cpp

@@ -72 +72 @@
 }
 
+int Piece::GetId() const
+{
+    return data->id;
+}
+
 int Piece::Blink()
 {
@@ -83 +88 @@
         return 0;
     }
+}
+
+int Piece::Pop()
+{
+    return 0;
 }
 

trunk/monsterz/piece.h

@@ -25 +25 @@
     void SetCell(Int2 cell);
     Int2 GetPos() const;
+    int GetId() const;
 
     int Blink();
+    int Pop();
     int Grab(Int2 dir);
     int Ungrab();