Changeset 746Tweet

Timestamp:

Mar 28, 2011, 1:31:29 AM (10 years ago)

Author:

sam

Message:

monsterz: perform move as soon as the grabbed piece is close to its
destination cell.

Location:

trunk/monsterz

Files:

• board.cpp (modified) (4 diffs)
• board.h (modified) (1 diff)
• mash.cpp (modified) (1 diff)

trunk/monsterz/board.cpp

@@ -237 +237 @@
             }
         }
+
+        /* Move initiated: if valid, perform immediately. */
+        if (data->dst_cell != vec2i(-1))
+        {
+            vec2i cell_a = data->src_cell;
+            vec2i cell_b = data->dst_cell;
+
+            if (Switch(cell_a, cell_b))
+                data->state = BoardData::HUNT_IDLE;
+        }
+
+        /* Mouse released, or exited window, or dragged too far. */
         if (!buttons[0] || mousepos.x == -1
              || (data->src_cell * data->size - data->grabbed.piece->GetPos()
                   - data->grabbed.piece->GetOffset()).sqlen() > 100 * 100)
         {
-            /* Mouse released, or exited window, or dragged too far. */
-            data->grabbed.piece->Ungrab(data->grabbed.piece->GetCell() * data->size);
+            vec2i cell_a = data->src_cell;
+            BoardData::Pair a = data->pairs[cell_a.i][cell_a.j];
+            a.piece->Ungrab(cell_a * data->size);
+
             if (data->dst_cell != vec2i(-1))
-                Switch(data->src_cell, data->dst_cell);
+            {
+                vec2i cell_b = data->dst_cell;
+                BoardData::Pair b = data->pairs[cell_b.i][cell_b.j];
+                b.piece->Ungrab(cell_b * data->size);
+            }
+
             data->state = BoardData::HUNT_IDLE;
         }
@@ -392 +411 @@
 }
 
-void Board::Switch(vec2i cell_a, vec2i cell_b)
+bool Board::Switch(vec2i cell_a, vec2i cell_b)
 {
     BoardData::Pair a = data->pairs[cell_a.i][cell_a.j];
@@ -407 +426 @@
         data->pairs[cell_a.i][cell_a.j] = a;
         data->pairs[cell_b.i][cell_b.j] = b;
-        a.piece->Ungrab(cell_a * data->size);
-        b.piece->Ungrab(cell_b * data->size);
-        return;
+        return false;
     }
 
@@ -541 +558 @@
             data->pairs[i][0].piece->SetBelow(below[i]);
     }
+
+    return true;
 }
 

trunk/monsterz/board.h

@@ -42 +42 @@
     /* Hunt mode */
     void Fill();
-    void Switch(vec2i cell_a, vec2i cell_b);
+    bool Switch(vec2i cell_a, vec2i cell_b);
     int ListMashes(int list[MAX_WIDTH][MAX_HEIGHT]);
     int ListMoves(int list[MAX_WIDTH][MAX_HEIGHT]);

trunk/monsterz/mash.cpp

@@ -88 +88 @@
         for (int n = 0; n < data->npieces && allready; n++)
         {
-            /* If piece is still too high, don't start the animation */
+            /* If piece is still too far, don't start the animation */
             vec2i shift = data->pieces[n]->GetShift();
-            if (shift.y > 2 || abs(shift.x) > 2)
+            if (abs(shift.y) + abs(shift.x) > 0)
                 allready = 0;
         }