/* 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;
}
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);
}
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);