X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=2ded5902b7e09301c01cb3334b066949116e4ca1;hb=4055bbb5a7882b70c5b83ca1f6f0a76161f8260b;hp=9b468efdd27d879ba1747f8c79ee3f87e168801c;hpb=86b4d41c2fac54a356d10f4a3c01849b5785487c;p=kub

diff --git a/kub.c b/kub.c
index 9b468ef..2ded590 100644
--- a/kub.c
+++ b/kub.c
@@ -51,7 +51,7 @@ typedef struct game {
     int num_players;
     board_t board;
     deck_t deck;
-    RsvgHandle *red6;
+    RsvgHandle *blanktile;
 } game_t;
 
 static void card_print(card_t card)
@@ -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;
@@ -308,7 +335,7 @@ static void game_init(game_t *game)
     deck_init(&game->deck);
     deck_shuffle(&game->deck);
 
-    game->red6 = rsvg_handle_new_from_file ("tiles/red6.svg", &error);
+    game->blanktile = rsvg_handle_new_from_file ("tiles/blanktile.svg", &error);
     if (error)
 	FATAL_ERROR (error->message);
 }
@@ -319,7 +346,8 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
 
     cr = gdk_cairo_create (widget->window);
 
-    rsvg_handle_render_cairo (game->red6, cr);
+    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);