gnome-games r8168 - trunk/aisleriot

[jclinton svn gnome org]

Author: jclinton
Date: Tue Oct 21 19:47:49 2008
New Revision: 8168
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8168&view=rev

Log:
Make the removed cards array an instance variable and add the dragged
cards to it so they can be animated from the drag position instead of
from the source slot. The slot's old cards array is now reset in two
places so a function was added to game.c to do this.

Modified:
   trunk/aisleriot/board.c
   trunk/aisleriot/game.c
   trunk/aisleriot/game.h

Modified: trunk/aisleriot/board.c
==============================================================================
--- trunk/aisleriot/board.c	(original)
+++ trunk/aisleriot/board.c	Tue Oct 21 19:47:49 2008
@@ -178,6 +178,9 @@
   /* Actor used for drawing the baize */
   ClutterActor *baize_actor;
 
+  /* Array RemovedCards to be dropped in animations */
+  GArray *removed_cards;
+
 #ifdef HAVE_MAEMO
   /* Tap-and-Hold */
   Slot *tap_and_hold_slot;
@@ -840,7 +843,6 @@
   GPtrArray *slots;
   int slot_num, i;
   Slot *slot;
-  GArray *removed_cards = g_array_new (FALSE, FALSE, sizeof (RemovedCard));
   GArray *animations = g_array_new (FALSE, FALSE, sizeof (AisleriotAnimStart));
 
   slots = aisleriot_game_get_slots (priv->game);
@@ -871,7 +873,7 @@
                                           &removed_card.cardy);
           removed_card.cardx += slot->rect.x;
           removed_card.cardy += slot->rect.y;
-          g_array_append_val (removed_cards, removed_card);
+          g_array_append_val (priv->removed_cards, removed_card);
         }
       }
     }
@@ -916,8 +918,8 @@
         Card added_card = CARD (slot->cards->data[i]);
         int j;
 
-        for (j = 0; j < removed_cards->len; j++) {
-          RemovedCard *removed_card = &g_array_index (removed_cards,
+        for (j = 0; j < priv->removed_cards->len; j++) {
+          RemovedCard *removed_card = &g_array_index (priv->removed_cards,
                                                       RemovedCard, j);
 
           if (added_card.attr.suit == removed_card->card.attr.suit
@@ -930,7 +932,7 @@
 
             g_array_append_val (animations, anim);
 
-            g_array_remove_index (removed_cards, j);
+            g_array_remove_index (priv->removed_cards, j);
 
             break;
           }
@@ -943,13 +945,12 @@
        animations->len, (const AisleriotAnimStart *) animations->data);
 
     /* Set the old cards back to the new cards */
-    g_byte_array_set_size (slot->old_cards, 0);
-    g_byte_array_append (slot->old_cards, slot->cards->data, slot->cards->len);
-    slot->old_exposed = slot->exposed;
+    aisleriot_game_reset_old_cards (slot);
   }
 
+  g_array_set_size (priv->removed_cards, 0);
+
   g_array_free (animations, TRUE);
-  g_array_free (removed_cards, TRUE);
 }
 
 static void
@@ -1141,9 +1142,6 @@
                        cards->data + priv->moving_cards_origin_card_id,
                        cards->len - priv->moving_cards_origin_card_id);
 
-  /* Take the cards off of the stack */
-  g_byte_array_set_size (cards, priv->moving_cards_origin_card_id);
-
   width = priv->card_size.width + (num_moving_cards - 1) * hslot->pixeldx;
   height = priv->card_size.height + (num_moving_cards - 1) * hslot->pixeldy;
 
@@ -1161,6 +1159,13 @@
   for (i = 0; i < priv->moving_cards->len; ++i) {
     Card hcard = CARD (priv->moving_cards->data[i]);
     ClutterActor *card_tex;
+    RemovedCard removed_card;
+
+    removed_card.cardx = x;
+    removed_card.cardy = y;
+    removed_card.card = hcard;
+
+    g_array_append_val (priv->removed_cards, removed_card);
 
     card_tex = aisleriot_card_new (priv->textures, hcard);
     clutter_actor_set_position (card_tex, x, y);
@@ -1171,8 +1176,12 @@
     y += hslot->pixeldy;
   }
 
+  /* Take the cards off of the stack */
+  g_byte_array_set_size (cards, priv->moving_cards_origin_card_id);
+
   slot_update_geometry (board, hslot);
   slot_update_card_images (board, hslot);
+  aisleriot_game_reset_old_cards (hslot);
 
   stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (board));
   clutter_container_add (CLUTTER_CONTAINER (stage),
@@ -1281,11 +1290,22 @@
   AisleriotBoardPrivate *priv = board->priv;
   Slot *hslot;
   gboolean moved = FALSE;
+  guint i;
 
   hslot = find_drop_target (board,
                             x - priv->last_click_x,
                             y - priv->last_click_y);
 
+  /* Reposition the removed cards so that they are relative to the
+     cursor position */
+  for (i = 0; i < priv->removed_cards->len; i++) {
+    RemovedCard *removed_card = &g_array_index (priv->removed_cards,
+                                                RemovedCard, i);
+
+    removed_card->cardx += x - priv->last_click_x;
+    removed_card->cardy += y - priv->last_click_y;
+  }
+
   if (hslot) {
     moved = aisleriot_game_drop_cards (priv->game,
                                        priv->moving_cards_origin_slot->id,
@@ -3107,6 +3127,8 @@
 
   priv->moving_cards = g_byte_array_sized_new (SLOT_CARDS_N_PREALLOC);
 
+  priv->removed_cards = g_array_new (FALSE, FALSE, sizeof (RemovedCard));
+
   gtk_widget_set_events (widget,
 			 gtk_widget_get_events (widget) |
                          GDK_EXPOSURE_MASK |
@@ -3163,6 +3185,8 @@
 
   g_free (priv->card_theme);
 
+  g_array_free (priv->removed_cards, TRUE);
+
   g_byte_array_free (priv->moving_cards, TRUE);
 
   g_object_unref (priv->images);

Modified: trunk/aisleriot/game.c
==============================================================================
--- trunk/aisleriot/game.c	(original)
+++ trunk/aisleriot/game.c	Tue Oct 21 19:47:49 2008
@@ -2093,3 +2093,11 @@
     *yoff = 0;
   }
 }
+
+void
+aisleriot_game_reset_old_cards (Slot *slot)
+{
+  g_byte_array_set_size (slot->old_cards, 0);
+  g_byte_array_append (slot->old_cards, slot->cards->data, slot->cards->len);
+  slot->old_exposed = slot->exposed;
+}

Modified: trunk/aisleriot/game.h
==============================================================================
--- trunk/aisleriot/game.h	(original)
+++ trunk/aisleriot/game.h	Tue Oct 21 19:47:49 2008
@@ -198,6 +198,8 @@
                                      gboolean old_cards,
                                      gint *xoff, gint *yoff);
 
+void aisleriot_game_reset_old_cards (Slot *slot);
+
 G_END_DECLS
 
 #endif /* !AISLERIOT_GAME_H */