X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=kub%2Fkub.c;h=5377fc47534bd0dff12cc3aab470ba507d90cdcf;hp=f3126f5ff87d18fcf75bc0a980672c30f5b8fff0;hb=5317a34c1c224c21f56fcdbe8cc1feb3cc3565ba;hpb=75ca69e4854cfe8c575391bdc55b4a47d5295fd6

diff --git a/kub/kub.c b/kub/kub.c
index f3126f5..5377fc4 100755
--- a/kub/kub.c
+++ b/kub/kub.c
@@ -71,6 +71,39 @@ 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;
+    int lowest = 14, highest = 0;
+    if (card_group->num_cards > 13 || card_group->num_cards < 3)
+    {
+	return 0;
+    }
+    for (i = 0; i < card_group->num_cards - 1; ++i)
+    {
+	if (card_group->cards[i].color != card_group->cards[i + 1].color)
+	{
+	    return 0;
+	}
+	if (card_group->cards[i].number > highest)
+	{
+	    highest = card_group->cards[i].number;
+	}
+	if (card_group->cards[i].number < lowest)
+	{
+	    lowest = card_group->cards[i].number;
+	}
+    }
+    if (highest - lowest != card_group->num_cards - 1)
+    {
+	return 0;
+    }
+    return 1;
+}
+#endif
+
+#if 0
 static int card_group_is_set(card_group_t *card_group)
 {
     int i;
@@ -90,30 +123,46 @@ static int card_group_is_set(card_group_t *card_group)
     seen_color[i] = card_group->cards[i].color;
     for (i = 0; i < card_group->num_cards; ++i)
     {
-	
 	seen_color[card_group->cards[i].color]++;
+	if (seen_color[card_group->cards[i].color] > 1)
+	{
+	    return 0;
+	}
     }
     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)
 {
@@ -143,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;
     }
 }
 
@@ -164,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;
@@ -188,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;
     
 }