Fixed deck_draw, though still have bugs in card_draw

diff --git a/kub.c b/kub.c
index 8a026a4369eccf1a2fa4f6883bab0d5d6516cf3f..0a5bc59a852a2ae7744936d17abd3c2ed1449a9b 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -59,6 +59,31 @@ static void card_print(card_t card)
     printf("%6s %2d\n", colors[card.color], card.number + 1);
 }
 
+static void card_draw(game_t *game, card_t *card, cairo_t *cr, int x, int y)
+{
+    char number_string[2];
+    number_string[0] = card->number + '0';
+    number_string[1] = '\0';
+
+    cairo_save(cr);
+    cairo_translate(cr, x, y);
+    rsvg_handle_render_cairo (game->blanktile, cr);
+    
+    if (card->color == BLACK)
+        cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+    if (card->color == BLUE)
+        cairo_set_source_rgb (cr, 0.0, 0.0, 1.0);      
+    if (card->color == RED)
+        cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
+    if (card->color == YELLOW)
+       cairo_set_source_rgb (cr, 1.0, .843, 0.0);
+    cairo_move_to (cr, 10, 25);
+    cairo_set_font_size(cr, 25);
+    cairo_show_text (cr, number_string);
+    
+    cairo_restore(cr);
+}
+
 static void card_group_init(card_group_t *card_group)
 {
     card_group->num_cards = 0;
@@ -286,21 +311,18 @@ static void deck_print(deck_t *deck)
 
 static void deck_draw(game_t *game, cairo_t *cr)
 {
-    int h, i, j;
-    for (h = 0; h < game->deck.num_cards; ++h)
+    int i, j;
+    
+    for (i = 0; i < 8; ++i)
     {
-       for (i = 0; i < 8; ++i)
+       for (j = 0; j < 13; ++j)
        {
-           for (j = 0; j < 13; ++j)
-           {
-               card_draw(game, &game->deck.cards[h], cr, 45 * j , 55 * i);
-           }
+           card_draw(game, &game->deck.cards[j + (i * 13)],
+                     cr, 45 * j, 55 * i);
        }
     }
 }   
 
-
-
 static void hand_print(game_t *game)
 {
     int i;
@@ -310,31 +332,6 @@ static void hand_print(game_t *game)
     }
 }
 
-static void card_draw(game_t *game, card_t *card, cairo_t *cr, int x, int y)
-{
-    char number_string[2];
-    number_string[0] = card->number + '0';
-    number_string[1] = '\0';
-
-    cairo_save(cr);
-    cairo_translate(cr, x, y);
-    rsvg_handle_render_cairo (game->blanktile, cr);
-    
-    if (card->color == BLACK)
-        cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
-    if (card->color == BLUE)
-        cairo_set_source_rgb (cr, 0.0, 0.0, 1.0);      
-    if (card->color == RED)
-        cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
-    if (card->color == YELLOW)
-       cairo_set_source_rgb (cr, 1.0, .843, 0.0);
-    cairo_move_to (cr, 10, 25);
-    cairo_set_font_size(cr, 25);
-    cairo_show_text (cr, number_string);
-    
-    cairo_restore(cr);
-}
-
 static void game_init(game_t *game)
 {
     int i;
@@ -363,10 +360,7 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
 
     cr = gdk_cairo_create (widget->window);
 
-    rsvg_handle_render_cairo (game->blanktile, cr);
-    card_draw(game, &game->deck.cards[0], cr, 45, 0);
-    card_draw(game, &game->deck.cards[1], cr, 90, 0);
-    //deck_draw(game, cr);
+    deck_draw(game, cr);
 
     cairo_destroy (cr);