Give each tile its own position and use it to draw the tile.

diff --git a/kub.c b/kub.c
index 0f195740f64b4f0b156412961a312157ee3e3349..912daded8e862b97c1bbb94a34e6755871a720a3 100644 (file)
--- 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);
        }
     }
 }