Changeset 243 for trunk/monsterz/piece.cppTweet

Timestamp:

Jan 19, 2011, 10:23:35 PM (10 years ago)

Author:

sam

Message:

Allow to immediately grab an ungrabbed piece if it is close enough.

File:

• trunk/monsterz/piece.cpp (modified) (6 diffs)

trunk/monsterz/piece.cpp

@@ -49 +49 @@
  */
 
-Piece::Piece(Game *game, int i, int j, int id)
+Piece::Piece(Game *game, Int2 cell, int id)
 {
     data = new PieceData();
@@ -55 +55 @@
     Ticker::Ref(game);
     data->tiler = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
-    data->cell = Int2(i, j);
-    data->pos = Int2(i * 48, j * 48);
+    data->cell = cell;
+    data->pos = cell * 48;
     data->id = id;
     data->state = PieceData::IDLE;
@@ -67 +67 @@
     case PieceData::IDLE:
         data->state = PieceData::BLINK;
-        data->timer = 400.0f;
+        data->timer = 400.0f; /* Duration of a blink */
         return 1;
     default:
@@ -78 +78 @@
     switch (data->state)
     {
+    case PieceData::UNGRAB:
+        if ((data->cell * 48 - data->pos).sqlen() > 24 * 24)
+            return 0;
+        /* Fall through */
     case PieceData::IDLE:
     case PieceData::BLINK:
@@ -119 +123 @@
         data->timer += deltams;
         Int2 trip = data->cell * 48 - data->tmp;
-        float total_time = trip.len() / 0.8f; /* Moving speed */
-        float t = total_time ? data->timer / total_time : 1.0f;
+        float moving_time = trip.len() / 0.8f; /* Moving speed */
+        float t = moving_time ? data->timer / moving_time : 1.0f;
         if (t >= 1.0f)
-        {
             t = 1.0f;
+        if (data->timer > moving_time + 200.0f)
             data->state = PieceData::IDLE;
-        }
-        data->pos = data->tmp + (t * trip + Float2(0.5f));
+        data->pos = data->tmp + (t * trip + 0.5f);
         break;
     }
@@ -154 +157 @@
         break;
     case PieceData::UNGRAB:
-        id = data->id + 2;
+        if ((data->cell * 48 - data->tmp).sqlen() > 24 * 24)
+            id = data->id + 2;
         z = 4;
         break;
     }
+
     data->game->GetScene()->AddTile((data->tiler << 16) | id, x, y, z, 0);
+
+    if (data->state == PieceData::GRAB)
+        data->game->GetScene()->AddTile((data->tiler << 16) | 0, x, y, z, 0);
 }