Kub can now _reliably_ shuffle deck and deal in 1-4 players

diff --git a/kub.c b/kub.c
index abe3b2d06dc4a708bcc69c40aa146465ab8f4f87..2afbe340182ac1852811fda16bd71a23ba1934c6 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -71,6 +71,7 @@ static void player_init(player_t *player)
     card_group_init(&player->hand);
 }
 
+#if 0
 static int card_group_is_run(card_group_t *card_group)
 {
     int i;
@@ -100,8 +101,9 @@ static int card_group_is_run(card_group_t *card_group)
     }
     return 1;
 }
+#endif
 
-
+#if 0
 static int card_group_is_set(card_group_t *card_group)
 {
     int i;
@@ -129,25 +131,38 @@ static int card_group_is_set(card_group_t *card_group)
     }
     return 1;
 }
+#endif
 
-#if 0
-static void deck_deal(deck_t *deck, game_t *game)
+static void deck_deal(game_t *game, deck_t *deck)
 {
     card_t temp;
     int rand_card;
-    int i, j;
-    for (i = 0; i < PLAYERS; ++i)
+    int i, j, newline;
+    
+    printf ("How many players(1-4) should I deal in? ");
+    game->num_players = getchar();
+    if (game->num_players == EOF)
+    {
+       printf ("\nGoodbye.\n");
+       exit (1);
+    }
+    newline = getchar();   
+    game->num_players -= '0';
+    
+    for (i = 0; i < game->num_players; ++i)
     {
-       for (j = 0; j < 13; ++j)
+       for (j = 0; j < 14; ++j)
        {
-           rand_card = ((last + 1.0) * rand()) / (RAND_MAX + 1.0);
+           rand_card = ((deck->num_cards + 1.0) * rand()) / (RAND_MAX + 1.0);
            temp = deck->cards[rand_card];
-           deck->cards[rand_card] = deck->cards[last];
-           game->players[i]->hand->cards[j] = temp;
+           deck->cards[rand_card] = deck->cards[deck->num_cards - 1];
+           game->players[i].hand.cards[j] = temp;
+           deck->num_cards -= 1;
+           game->players[i].hand.num_cards += 1;
        }
     }
+    printf ("Game dealt for %d player(s)\n", game->num_players);
 }
-#endif
 
 static void deck_init(deck_t *deck)
 {
@@ -177,8 +192,8 @@ static void deck_shuffle(deck_t *deck)
     {
        rand_card = ((last + 1.0) * rand()) / (RAND_MAX + 1.0);
        temp = deck->cards[rand_card];
-       deck->cards[rand_card] = deck->cards[last];
-       deck->cards[last] = temp;
+       deck->cards[rand_card] = deck->cards[last - 1];
+       deck->cards[last - 1] = temp;
     }
 }
 
@@ -198,6 +213,15 @@ static void deck_print(deck_t *deck)
     printf ("There are %d tiles in the deck\n" , deck->num_cards);
 }
 
+static void hand_print(game_t *game)
+{
+    int i;
+    for (i = 0; i < game->players[0].hand.num_cards; ++i)
+    {
+       card_print(game->players[0].hand.cards[i]);
+    }
+}
+
 static void game_init(game_t *game)
 {
     int i;
@@ -222,7 +246,9 @@ int main(void)
     
     game_init(&game);
     deck_print(&game.deck);
-    
+    deck_deal(&game, &game.deck);
+    hand_print(&game);
+    deck_print(&game.deck);
     return 0;
     
 }