Fix compilation errors (& confusion)

diff --git a/kub.c b/kub.c
index a83555d3977a93713e3464c89b7ccd70a84998df..f7f2fe3edf9e7c1818b8af5233f48a8749a19946 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -294,24 +294,24 @@ 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[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)
+    if (card->color == BLACK)
         cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
-    if (&card->color == BLUE)
+    if (card->color == BLUE)
         cairo_set_source_rgb (cr, 0.0, 0.0, 1.0);      
-    if (&card->color == RED)
+    if (card->color == RED)
         cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
-    if (&card->color == YELLOW)
+    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[0]);
+    cairo_show_text (cr, number_string);
     
     cairo_restore(cr);
 }
@@ -345,7 +345,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);
+    card_draw(game, &game->deck.cards[0], cr, 320, 240);
 
     cairo_destroy (cr);