Changeset 263Tweet

Timestamp:

Jan 23, 2011, 2:21:15 PM (9 years ago)

Author:

sam

Message:

Spawn new pieces at the correct coordinates for a free fall.

Location:

trunk/monsterz

Files:

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

trunk/monsterz/board.cpp

@@ -217 +217 @@
     b->Goto(cell_a * 48, 0.3f);
 
-    /* Remove matching tiles */
-    do for (int j = 8; j--;) for (int i = 0; i < 8; i++)
-    {
-        if (list[i][j])
-        {
+    /* Remove matching pieces */
+    do
+    {
+//        Mash *mash = new Mash(data->game);
+//        Ticker::Ref(mash);
+
+        for (int j = 8; j--;) for (int i = 0; i < 8; i++)
+        {
+            if (!list[i][j])
+                continue;
+
+            /* The mash becomes the new owner of the disappearing piece */
+//            mash->AddPiece(data->pieces[i][j], Int2(i, j));
             Ticker::Unref(data->pieces[i][j]);
+
+            Int2 newpos = data->pieces[i][7]->GetPos() + Int2(0, 48);
+
             for (int j2 = j + 1; j2 < 8; j2++)
             {
@@ -231 +242 @@
             }
             data->pieces[i][7] = new Piece(data->game, Int2(i, 7), 25 + 5 * (rand() % 7));
+            data->pieces[i][7]->SetPos(newpos);
+            data->pieces[i][7]->Goto(Int2(i, 7) * 48, 0.1f);
             Ticker::Ref(data->pieces[i][7]);
             list[i][7] = 0;

trunk/monsterz/piece.cpp

@@ -65 +65 @@
 {
     data->cell = cell;
+}
+
+Int2 Piece::GetCell() const
+{
+    return data->cell;
+}
+
+void Piece::SetPos(Int2 pos)
+{
+    data->pos = pos;
 }
 

trunk/monsterz/piece.h

@@ -24 +24 @@
 
     void SetCell(Int2 cell);
+    Int2 GetCell() const;
+    void SetPos(Int2 pos);
     Int2 GetPos() const;
     int GetId() const;