From 646aa6968206c6ba983210457bdf28d717caae93 Mon Sep 17 00:00:00 2001 From: Kevin Worth Date: Tue, 20 Feb 2007 09:50:45 -0500 Subject: [PATCH] Started deck_draw, currently full of errors --- kub.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/kub.c b/kub.c index 2ded590..8a026a4 100644 --- a/kub.c +++ b/kub.c @@ -271,11 +271,11 @@ static void deck_shuffle(deck_t *deck) static void deck_print(deck_t *deck) { int h, i, j; - for (h = 0; h <= 1; ++h) + for (h = 0; h < 2; ++h) { - for (i = 0; i <= 3; ++i) + for (i = 0; i < 4; ++i) { - for (j = 0; j <= 12; ++j) + for (j = 0; j < 13; ++j) { card_print(deck->cards[j + (i * 13) + (h * 52)]); } @@ -284,6 +284,23 @@ static void deck_print(deck_t *deck) printf ("There are %d tiles in the deck\n" , deck->num_cards); } +static void deck_draw(game_t *game, cairo_t *cr) +{ + int h, i, j; + for (h = 0; h < game->deck.num_cards; ++h) + { + for (i = 0; i < 8; ++i) + { + for (j = 0; j < 13; ++j) + { + card_draw(game, &game->deck.cards[h], cr, 45 * j , 55 * i); + } + } + } +} + + + static void hand_print(game_t *game) { int i; @@ -296,7 +313,7 @@ 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 + '0'; number_string[1] = '\0'; cairo_save(cr); @@ -310,8 +327,8 @@ static void card_draw(game_t *game, card_t *card, cairo_t *cr, int x, int y) 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_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); @@ -347,7 +364,9 @@ 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, 45, 0); + card_draw(game, &game->deck.cards[1], cr, 90, 0); + //deck_draw(game, cr); cairo_destroy (cr); -- 2.43.0