[gnome-games/gnibbles-clutter] Reseting and animating the worm more nicely when dying

[Guillaume Béland <guillaubel src gnome org>]

commit 23b0a75b371000d2bb05bbe00a71808d41ab63a8
Author: Guillaume Beland <guillaume beland gmail com>
Date:   Wed Aug 19 16:19:44 2009 -0400

    Reseting and animating the worm more nicely when dying

 gnibbles/board.c    |    4 +-
 gnibbles/gnibbles.c |   19 +++++++++++-----
 gnibbles/worm.c     |   56 ++++++++++++++++++++++++++++++---------------------
 3 files changed, 48 insertions(+), 31 deletions(-)
---
diff --git a/gnibbles/board.c b/gnibbles/board.c
index b8294ba..9483658 100644
--- a/gnibbles/board.c
+++ b/gnibbles/board.c
@@ -66,7 +66,7 @@ gnibbles_board_new (void)
 
   board->surface = clutter_texture_new_from_file (filename, NULL);
  
-  clutter_actor_set_opacity (CLUTTER_ACTOR (board->surface), 0xff);
+  clutter_actor_set_opacity (CLUTTER_ACTOR (board->surface), 80);
   g_value_init (&val, G_TYPE_BOOLEAN);
   g_value_set_boolean ( &val, TRUE);
 
@@ -165,7 +165,7 @@ gnibbles_board_load_level (GnibblesBoard *board)
   clutter_actor_raise (board->level, board->surface);
 
   clutter_actor_set_opacity (board->level, 0);
-  clutter_actor_set_scale (CLUTTER_ACTOR (board->level), 1.5, 1.5);
+  clutter_actor_set_scale (CLUTTER_ACTOR (board->level), 2.0, 2.0);
   clutter_actor_animate (board->level, CLUTTER_EASE_OUT_CIRC, 510,
                          "opacity", 0xff,
                          "fixed::scale-gravity", CLUTTER_GRAVITY_CENTER,
diff --git a/gnibbles/gnibbles.c b/gnibbles/gnibbles.c
index ac2d6d0..481858b 100644
--- a/gnibbles/gnibbles.c
+++ b/gnibbles/gnibbles.c
@@ -257,19 +257,25 @@ gnibbles_move_worms (void)
       }
     }
   }
-
+/*
+  printf ("head: (%d,%d) tail: (%d,%d) ? STOP:%d\n", 
+          worms[0]->xhead, worms[0]->yhead,
+          worms[0]->xtail, worms[0]->ytail, worms[0]->stop);
+*/
   for (i = 0; i < properties->numworms; i++) {
-    dead[i] = !gnibbles_worm_test_move_head (worms[i]);
-    status &= !dead[i];
+    if (!worms[i]->stop) {
+      dead[i] = !gnibbles_worm_test_move_head (worms[i]);
+      status &= !dead[i];
+    }
   }
  
   for (i = 0; i < properties->numworms; i++) {
-    if (!dead[i] && worms[i]->lives > 0)
+    if (!dead[i] && worms[i]->lives > 0 && !worms[i]->stop)
       gnibbles_worm_move_tail (worms[i]);
   }
   
   for (i = 0; i < properties->numworms; i++) {
-    if (!dead[i] && worms[i]->lives > 0)
+    if (!dead[i] && worms[i]->lives > 0 && !worms[i]->stop)
       gnibbles_worm_move_head (worms[i]);
   }
 
@@ -279,7 +285,8 @@ gnibbles_move_worms (void)
           && worms[i]->xhead == worms[j]->xhead
 	        && worms[i]->yhead == worms[j]->yhead
 	        && worms[i]->lives > 0
-	        && worms[j]->lives > 0)
+	        && worms[j]->lives > 0
+          && !worms[i]->stop)
 	      dead[i] = TRUE;
     }
   }
diff --git a/gnibbles/worm.c b/gnibbles/worm.c
index cc7b983..3e90034 100644
--- a/gnibbles/worm.c
+++ b/gnibbles/worm.c
@@ -458,22 +458,35 @@ gnibbles_worm_animate_death (GnibblesWorm *worm)
 {
   ClutterActor *group = clutter_group_new ();
   ClutterActor *tmp = NULL;
+
   int i;
   gfloat x,y;
 
   for (i = 0; i < g_list_length (worm->list); i++) {
     tmp = gtk_clutter_texture_new_from_pixbuf (worm_pixmaps [worm->number]);
+
     clutter_actor_get_position (CLUTTER_ACTOR (g_list_nth_data (worm->list, i)),
                                 &x, &y);
+
     clutter_actor_set_position (CLUTTER_ACTOR (tmp), x, y);
     clutter_actor_set_size (CLUTTER_ACTOR (tmp), 
                             properties->tilesize,
                             properties->tilesize);
     clutter_container_add_actor (CLUTTER_CONTAINER (group), tmp);
   }
+
+  for (i = 0; i < g_list_length (worm->list); i++)
+    worm->list = g_list_remove (worm->list, g_list_nth_data (worm->list, i));
+
+  clutter_actor_set_opacity (CLUTTER_ACTOR (worm->actors), 0x00);
+
+  clutter_group_remove_all (CLUTTER_GROUP (worm->actors));
+  g_list_free (worm->list);
+  worm->list = NULL;
+
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
 
-  clutter_actor_animate (group, CLUTTER_EASE_OUT_QUAD, 210,
+  clutter_actor_animate (group, CLUTTER_EASE_OUT_QUAD, 310,
                          "opacity", 0,
                          "scale-x", 2.0,
                          "scale-y", 2.0,
@@ -518,7 +531,7 @@ void
 gnibbles_worm_show (GnibblesWorm *worm)
 {
   clutter_actor_set_opacity (worm->actors, 0);
-  clutter_actor_set_scale (worm->actors, 2.0, 2.0);
+  clutter_actor_set_scale (worm->actors, 4.0, 4.0);
   clutter_actor_animate (worm->actors, CLUTTER_EASE_OUT_CIRC, 510,
                          "scale-x", 1.0,
                          "scale-y", 1.0,
@@ -534,10 +547,12 @@ gnibbles_worm_reset (GnibblesWorm *worm)
   worm->stop = TRUE;
   gnibbles_worm_animate_death (worm);
 
-  gint j;
+  gint i,j;
 
-  for (j = 0; j < g_list_length(worm->list); j++)
-    gnibbles_worm_move_tail_pointer (worm);
+  for (i = 0; i < BOARDHEIGHT; i++)
+    for (j = 0; j < BOARDWIDTH; j++)
+      if (board->walls[j][i] == WORMCHAR + worm->number)
+        board->walls[j][i] = EMPTYCHAR;
 
   worm->xhead = worm->xstart;
   worm->yhead = worm->ystart;
@@ -545,18 +560,17 @@ gnibbles_worm_reset (GnibblesWorm *worm)
   worm->ytail = worm->yhead;
   worm->direction = worm->direction_start;
   worm->length = 1;
+  worm->change = SLENGTH - 1;
 
-  if (worm->lives > 0) {
-    worm->change = SLENGTH - 1;
-    gnibbles_worm_show (worm);
-  }
-  
-  gint i;
+  gnibbles_worm_queue_empty (worm);
+  clutter_actor_set_opacity (CLUTTER_ACTOR (worm->actors), 0xFF);
+  board->walls[worm->xtail][worm->ytail] = EMPTYCHAR;
+/*
   FILE *fo;
-  fo = fopen ("level_output", "w");
+  fo = fopen ("output.txt", "w");
   for (i = 0; i < BOARDHEIGHT; i++) {
-    for (j = 0; j < BOARDHEIGHT; j++) {
-      if (board->walls[j][i] == 'a')
+    for (j = 0; j < BOARDWIDTH; j++) {
+      if (board->walls[j][i] == EMPTYCHAR)
         fprintf (fo, "%c", ' ');
       else
         fprintf (fo, "%c", board->walls[j][i]);
@@ -564,6 +578,11 @@ gnibbles_worm_reset (GnibblesWorm *worm)
     fprintf (fo, "\n");
   }
   fclose (fo);
+*/
+  //if (worm->lives > 0) 
+    //gnibbles_worm_show (worm);
+  gnibbles_worm_move_head_pointer (worm);
+  worm->stop = FALSE;
 }
 
 void
@@ -612,8 +631,6 @@ gnibbles_worm_resize (GnibblesWorm *worm, gint newtile)
 void
 gnibbles_worm_move_head (GnibblesWorm *worm)
 {
-  if (worm->stop)
-    return;
   if (g_list_length (worm->list) <= 1)
     return;
 
@@ -630,18 +647,11 @@ gnibbles_worm_move_head (GnibblesWorm *worm)
 void
 gnibbles_worm_move_tail (GnibblesWorm *worm)
 {
-  if (worm->stop)
-    return;
   if (g_list_length (worm->list) <= 1)
     return;
 
   if (worm->change <= 0) {
     gnibbles_worm_move_tail_pointer (worm);
-    if (worm->change) {
-      //gnibbles_worm_move_tail_pointer (worm);
-      //gnibbles_worm_reduce_tail (worm, worm->change * -1);
-      //worm->change++;
-    }
   } else {
     worm->change--;
     worm->length++;