Changeset 248Tweet

Timestamp:

Jan 20, 2011, 2:59:43 PM (12 years ago)

Author:

sam

Message:

Make swaps effective now, just for testing purposes.

Location:

trunk/monsterz

Files:

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

trunk/monsterz/board.cpp

@@ -121 +121 @@
             if (cur_cell.i < 0 || cur_cell.i >= 8
                  || cur_cell.j < 0 || cur_cell.j >= 8
-                 || (cur_pos - cur_cell * 48).sqlen() > 24 * 24)
+                 || (cur_pos - cur_cell * 48).sqlen() > 24 * 24
+                 || (cur_cell - data->src_cell).sqlen() != 1)
                 cur_cell = Int2(-1);
-            /* If target cell changed, change destinations. */
+            /* If potential target changed, update our cache. */
             if (cur_cell != data->dst_cell)
             {
@@ -129 +130 @@
                     data->pieces[data->dst_cell.i]
                                 [data->dst_cell.j]->Goto(data->dst_cell * 48);
-                if (cur_cell != Int2(-1)
-                     && (cur_cell - data->src_cell).sqlen() == 1)
+                if (cur_cell != Int2(-1))
                     data->pieces[cur_cell.i]
                                 [cur_cell.j]->Goto(data->src_cell * 48);
@@ -136 +136 @@
             }
         }
-        if (!buttons[0] || mouse.x < 0 || mouse.y < 0)
+        if (!buttons[0] || mouse.x < 0 || mouse.y < 0
+             || (data->src_cell * 48
+                  - data->grabbed->GetPos()).sqlen() > 100 * 100)
         {
+            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();
-            if (data->dst_cell != Int2(-1))
-                data->pieces[data->dst_cell.i]
-                            [data->dst_cell.j]->Goto(data->dst_cell * 48);
             data->state = BoardData::IDLE;
         }

trunk/monsterz/piece.cpp

@@ -62 +62 @@
 }
 
+void Piece::SetCell(Int2 cell)
+{
+    data->cell = cell;
+}
+
 Int2 Piece::GetPos() const
 {

trunk/monsterz/piece.h

@@ -23 +23 @@
     virtual ~Piece();
 
+    void SetCell(Int2 cell);
     Int2 GetPos() const;