Changeset 266 for trunk/monsterz/mash.cppTweet

Timestamp:

Jan 23, 2011, 5:47:21 PM (10 years ago)

Author:

sam

Message:

Add the pop animation frame to disappearing monsterz.

File:

• trunk/monsterz/mash.cpp (modified) (5 diffs)

trunk/monsterz/mash.cpp

@@ -33 +33 @@
     Piece *pieces[8 * 8];
     Int2 cells[8 * 8];
-    int npieces, finished;
+    int npieces;
+
+    enum
+    {
+        WAIT,
+        POP,
+        DEAD,
+    }
+    state;
 };
 
@@ -47 +55 @@
     Ticker::Ref(game);
     data->npieces = 0;
-    data->finished = 0;
+    data->state = MashData::WAIT;
 }
 
@@ -57 +65 @@
 }
 
-int Mash::IsFinished() const
+int Mash::IsDead() const
 {
-    return data->finished;
+    return data->state == MashData::DEAD;
 }
 
@@ -66 +74 @@
     Entity::TickGame(deltams);
 
-    if (data->finished)
-        return;
+    switch (data->state)
+    {
+    case MashData::WAIT:
+    {
+        int inplace = 1;
+        for (int n = 0; n < data->npieces && inplace; n++)
+        {
+            Int2 dest = data->pieces[n]->GetCell() * 48;
+            Int2 cur = data->pieces[n]->GetPos();
 
-    int inplace = 1;
-    for (int n = 0; n < data->npieces && inplace; n++)
+            /* If piece is still too high, don't start the animation */
+            if (cur.y - dest.y > 2)
+                inplace = 0;
+        }
+
+        if (inplace)
+        {
+            for (int n = 0; n < data->npieces; n++)
+                data->pieces[n]->Pop();
+            data->state = MashData::POP;
+        }
+        break;
+    }
+    case MashData::POP:
     {
-        Int2 dest = data->pieces[n]->GetCell() * 48;
-        Int2 cur = data->pieces[n]->GetPos();
-
-        /* If piece is still too high, don't start the animation */
-        if (cur.y - dest.y > 12)
-            inplace = 0;
+        int alldead = 1;
+        for (int n = 0; n < data->npieces && alldead; n++)
+            if (!data->pieces[n]->IsDead())
+                alldead = 0;
+        if (alldead)
+        {
+            for (int n = 0; n < data->npieces; n++)
+                Ticker::Unref(data->pieces[n]);
+            data->npieces = 0;
+            data->state = MashData::DEAD;
+        }
+        break;
     }
-
-    if (inplace)
-    {
-        for (int n = 0; n < data->npieces; n++)
-            Ticker::Unref(data->pieces[n]);
-        data->finished = 1;
+    case MashData::DEAD:
+        break;
     }
 }
@@ -95 +124 @@
 Mash::~Mash()
 {
+    for (int n = 0; n < data->npieces; n++)
+        Ticker::Unref(data->pieces[n]);
     Ticker::Unref(data->game);
     delete data;