From 9a6cebd91e1c580cffcdd850277240c22a0f7287 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 1 Mar 2007 06:50:18 -0800 Subject: [PATCH] Give each tile its own position and use it to draw the tile. --- kub.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kub.c b/kub.c index 0f19574..912dade 100644 --- a/kub.c +++ b/kub.c @@ -15,6 +15,8 @@ typedef enum {BLACK, BLUE, RED, YELLOW} color_t; typedef struct tile { color_t color; int number; + int x; + int y; } tile_t; #define DECK_MAX_TILES 104 @@ -59,6 +61,8 @@ tile_init (tile_t *tile, color_t color, int number) { tile->color = color; tile->number = number; + tile->x = 0; + tile->y = 0; } static void tile_print(tile_t tile) @@ -66,7 +70,7 @@ static void tile_print(tile_t tile) printf("%6s %2d\n", colors[tile.color], tile.number + 1); } -static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr, int x, int y) +static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr) { char number_string[3]; int len; @@ -76,7 +80,7 @@ static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr, int x, int y) FATAL_ERROR ("snprintf failed"); cairo_save(cr); - cairo_translate(cr, x, y); + cairo_translate(cr, tile->x, tile->y); rsvg_handle_render_cairo (game->blanktile, cr); if (tile->color == BLACK) @@ -325,8 +329,7 @@ static void deck_draw(game_t *game, cairo_t *cr) { for (j = 0; j < 13; ++j) { - tile_draw(game, &game->deck.tiles[j + (i * 13)], - cr, 45 * j, 55 * i); + tile_draw(game, &game->deck.tiles[j + (i * 13)], cr); } } } -- 2.43.0