Deal in players and draw tiles for player 1(players[0])

diff --git a/kub.c b/kub.c
index 6a2a3a5903e7ca4a51590430747e1bd5a325ca16..1e508b7b3decc4c2b0609cf32dee74e008a21883 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -95,8 +95,7 @@ typedef struct game {
     int diff_x, diff_y;
 } game_t;
 
-static void
-tile_init (tile_t *tile, color_t color, int number)
+static void tile_init (tile_t *tile, color_t color, int number)
 {
     tile->color = color;
     tile->number = number;
@@ -104,6 +103,12 @@ tile_init (tile_t *tile, color_t color, int number)
     tile->y = 0;
 }
 
+static void tile_set_x_y (tile_t *tile, int x, int y)
+{
+    tile->x = x;
+    tile->y = y;
+}
+
 static void tile_print(tile_t tile)
 {
     printf("%6s %2d\n", colors[tile.color], tile.number + 1);
@@ -382,19 +387,31 @@ static void deck_draw(game_t *game, cairo_t *cr)
     }
 }   
 
-static void hand_print(game_t *game)
+static void hand_print(game_t *game, int player)
 {
     int i;
-    for (i = 0; i < game->players[0].hand.num_tiles; ++i)
+    for (i = 0; i < game->players[player].hand.num_tiles; i++)
     {
-       tile_print(game->players[0].hand.tiles[i]);
+       tile_print(game->players[player].hand.tiles[i]);
     }
 }
 
-/* static void hand_draw(game_t *game) */
-/* { */
-    
-/* } */
+static void hand_draw(game_t *game, int player, cairo_t *cr)
+{
+    int i;
+    int gwdw = GAME_WINDOW_DEFAULT_WIDTH;
+    int gwdh = GAME_WINDOW_DEFAULT_HEIGHT;
+    for (i = 0; i < game->players[player].hand.num_tiles; i++)    
+    {
+       tile_set_x_y(&game->players[player].hand.tiles[i],  
+                    ((gwdw / game->players[player].hand.num_tiles)) * i,
+                    (gwdh - TILE_HEIGHT - 6) );
+    }
+    for (i = 0; i < game->players[player].hand.num_tiles; i++)
+    {
+       tile_draw(game, &game->players[player].hand.tiles[i], cr);
+    }
+}
 
 static void game_init(game_t *game)
 {
@@ -429,6 +446,8 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
 
     deck_draw(game, cr);
 
+    hand_draw(game, 0, cr);
+
     cairo_destroy (cr);
 
     return TRUE;
@@ -444,7 +463,7 @@ static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_
 static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
 {
     int i, tile_x, tile_y;
-
+    
     for (i = 0; i < game->deck.num_tiles; i++)
     {
        tile_x = game->deck.tiles[i].x;
@@ -501,8 +520,8 @@ int main(int argc, char *argv[])
     game_init(&game);
     deck_print(&game.deck);
     deck_spread(&game.deck);
-    //deck_deal(&game, &game.deck);
-    //hand_print(&game);
+    deck_deal(&game, &game.deck);
+    //hand_print(&game, 0); //With Zero being passed, will print hand for player 1(players[0])
     //deck_print(&game.deck);
 
     /* Create a new window */