Fix signature of card_compare to make qsort happy

[kub] / kub.c

diff --git a/kub.c b/kub.c
index e11b87ecf29b117f30ff398c7632e9f89fea832c..2ded5902b7e09301c01cb3334b066949116e4ca1 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -84,8 +84,10 @@ static void player_init(player_t *player)
 /* If card_one < card_two, then return value will be negative
    if they are equal, 0 will be returned,
    if card_one > card_two, then return value will be positive */
-static int card_compare(card_t *card_one, card_t *card_two)
+static int card_compare(const void *one, const void *two)
 {
+    const card_t *card_one = one;
+    const card_t *card_two = two;
     return card_one->number - card_two->number;
 }
 
@@ -291,6 +293,31 @@ 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;
+    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, 1.0, 0.0);
+    cairo_move_to (cr, 0, 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;
@@ -320,6 +347,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, 320, 240);
 
     cairo_destroy (cr);
 
@@ -358,7 +386,7 @@ int main(int argc, char *argv[])
     
     game_init(&game);
     deck_print(&game.deck);
-    deck_deal(&game, &game.deck);
+    //deck_deal(&game, &game.deck);
     hand_print(&game);
     deck_print(&game.deck);