Minor fixes to kub

[ttt] / kub / kub.c

diff --git a/kub/kub.c b/kub/kub.c
index 989277e30eccf1b1d722ea7b56385d1089f3efd2..c67f83b68fc65e6d05a584a051b24e471c8d3518 100755 (executable)
--- a/kub/kub.c
+++ b/kub/kub.c
@@ -71,6 +71,37 @@ static void player_init(player_t *player)
     card_group_init(&player->hand);
 }
 
+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;
+}
+
+
 static int card_group_is_set(card_group_t *card_group)
 {
     int i;
@@ -90,24 +121,30 @@ 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;
 }
 
 #if 0
-static void deck_deal(deck_t *deck)
+static void deck_deal(deck_t *deck, game_t *game)
 {
     card_t temp;
     int rand_card;
-    int i;
-    for (i = 0; i < Players )
+    int i, j;
+    for (i = 0; i < PLAYERS; ++i)
     {
-       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;
+       for (j = 0; j < 13; ++j)
+       {
+           rand_card = ((last + 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;
+       }
     }
 }
 #endif
@@ -125,6 +162,7 @@ static void deck_init(deck_t *deck)
                deck->cards[j + (i * 13) + (h * 52)].color = i;
                deck->cards[j + (i * 13) + (h * 52)].number = j;
                deck->num_cards += 1;
+               printf ("There are %d tiles in the deck\n", deck->num_cards);
            }
        }
     }
@@ -157,6 +195,7 @@ static void deck_print(deck_t *deck)
            }
        }
     }
+    printf ("There are %d tiles in the deck\n" , deck->num_cards);
 }
 
 static void game_init(game_t *game)
@@ -177,13 +216,12 @@ static void game_init(game_t *game)
 
 int main(void)
 {
-    deck_t deck;
     game_t game;
     
     srand(time(NULL));
     
     game_init(&game);
-    deck_print(&deck);
+    deck_print(&game.deck);
     
     return 0;