gnome-games r7222 - trunk/libgames-support

[chpe svn gnome org]

Author: chpe
Date: Sun Jan 13 22:09:21 2008
New Revision: 7222
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7222&view=rev

Log:
Move code around.


Modified:
   trunk/libgames-support/games-card.c
   trunk/libgames-support/games-card.h

Modified: trunk/libgames-support/games-card.c
==============================================================================
--- trunk/libgames-support/games-card.c	(original)
+++ trunk/libgames-support/games-card.c	Sun Jan 13 22:09:21 2008
@@ -61,7 +61,7 @@
 };
 
 /**
- * games_card_get_name_by_id_snprintf:
+ * games_card_get_node_by_suit_and_rank_snprintf:
  * @buffer: the output buffer
  * @bufsize: the size of the output buffer
  * @card_id: the ID of the card
@@ -72,21 +72,19 @@
  * was large enough.
  */
 int
-games_card_get_name_by_id_snprintf (char *buffer,
-                                    gsize bufsize,
-                                    int card_id)
+games_card_get_node_by_suit_and_rank_snprintf (char *buffer,
+                                               gsize bufsize,
+                                               int suit,
+                                               int rank)
 {
-  int suit, rank, len;
-
-  suit = card_id / 13;
-  rank = card_id % 13;
+  int len;
 
   if (G_LIKELY (suit < 4)) {
-    len = g_snprintf (buffer, bufsize, "%s-%s",
-                      suites + suite_offsets[suit],
-                      ranks + rank_offsets[rank]);
+    len = g_snprintf (buffer, bufsize, "#%s_%s",
+                      ranks + rank_offsets[rank],
+                      suites + suite_offsets[suit]);
   } else {
-    len = g_snprintf (buffer, bufsize, "%s",
+    len = g_snprintf (buffer, bufsize, "#%s",
                       extra_cards + extra_card_offsets[rank]);
   }
 
@@ -94,7 +92,7 @@
 }
 
 /**
- * games_card_get_node_by_suit_and_rank_snprintf:
+ * games_card_get_name_by_id_snprintf:
  * @buffer: the output buffer
  * @bufsize: the size of the output buffer
  * @card_id: the ID of the card
@@ -105,19 +103,21 @@
  * was large enough.
  */
 int
-games_card_get_node_by_suit_and_rank_snprintf (char *buffer,
-                                               gsize bufsize,
-                                               int suit,
-                                               int rank)
+games_card_get_name_by_id_snprintf (char *buffer,
+                                    gsize bufsize,
+                                    int card_id)
 {
-  int len;
+  int suit, rank, len;
+
+  suit = card_id / 13;
+  rank = card_id % 13;
 
   if (G_LIKELY (suit < 4)) {
-    len = g_snprintf (buffer, bufsize, "#%s_%s",
-                      ranks + rank_offsets[rank],
-                      suites + suite_offsets[suit]);
+    len = g_snprintf (buffer, bufsize, "%s-%s",
+                      suites + suite_offsets[suit],
+                      ranks + rank_offsets[rank]);
   } else {
-    len = g_snprintf (buffer, bufsize, "#%s",
+    len = g_snprintf (buffer, bufsize, "%s",
                       extra_cards + extra_card_offsets[rank]);
   }
 
@@ -141,16 +141,3 @@
 
   return g_strdup (name);
 }
-
-/**
- * games_card_get_name:
- * @card:
- *
- * Returns: a localised name for @card, e.g. "Face-down card" or
- * "9 of clubs", etc.
- */
-const char *
-games_card_get_name (Card card)
-{
-  return NULL;
-}

Modified: trunk/libgames-support/games-card.h
==============================================================================
--- trunk/libgames-support/games-card.h	(original)
+++ trunk/libgames-support/games-card.h	Sun Jan 13 22:09:21 2008
@@ -99,16 +99,16 @@
   GAMES_CARDS_TOTAL = 56,
 } GamesCardIDType;
 
-int games_card_get_name_by_id_snprintf (char *buffer,
-                                        gsize bufsize,
-                                        int card_id);
 int games_card_get_node_by_suit_and_rank_snprintf (char *buffer,
                                                    gsize bufsize,
                                                    int suit,
                                                    int rank);
-char * games_card_get_name_by_id (int card_id);
 
-const char *games_card_get_name (Card card);
+int games_card_get_name_by_id_snprintf (char *buffer,
+                                        gsize bufsize,
+                                        int card_id);
+
+char * games_card_get_name_by_id (int card_id);
 
 G_END_DECLS