Changeset 285Tweet

Timestamp:

Jan 25, 2011, 2:19:27 PM (10 years ago)

Author:

sam

Message:

More animation frames during mashes.

Location:

trunk/monsterz

Files:

• mash.cpp (modified) (2 diffs)
• piece.cpp (modified) (2 diffs)

trunk/monsterz/mash.cpp

@@ -35 +35 @@
     Int2 cells[8 * 8];
     int npieces;
+    float timer;
 
     enum
     {
         WAIT,
+        DUH,
         POP,
         DEAD,
@@ -94 +96 @@
         if (allready)
         {
-            Sampler::PlaySample(data->pop);
+            Sampler::PlaySample(data->duh);
             for (int n = 0; n < data->npieces; n++)
                 data->pieces[n]->Pop();
+            data->timer = 400.0f;
+            data->state = MashData::DUH;
+        }
+        break;
+    }
+    case MashData::DUH:
+        if ((data->timer -= deltams) < 0.0f)
+        {
+            Sampler::PlaySample(data->pop);
             data->state = MashData::POP;
         }
         break;
-    }
     case MashData::POP:
     {

trunk/monsterz/piece.cpp

@@ -169 +169 @@
     case PieceData::POP:
         data->state = PieceData::POP;
-        data->timer = 400.0f;
+        data->timer = 600.0f;
         return 1;
     default:
@@ -314 +314 @@
         break;
     case PieceData::POP:
-        id = data->id + 7;
+        if (data->timer < 60)
+            id = data->id + 9;
+        else if (data->timer < 120)
+            id = data->id + 8;
+        else if (data->timer < 180)
+            id = data->id + 7;
+        else if (data->timer < 240)
+            id = data->id + 6;
+        else
+            id = data->id + 5;
         break;
     case PieceData::DEAD: