Minor fixes to kub

[ttt] / kub / kub.c

diff --git a/kub/kub.c b/kub/kub.c
index 9fc15528ea17f7be5a793ddb452e4c9bbe5ea17f..c67f83b68fc65e6d05a584a051b24e471c8d3518 100755 (executable)
--- a/kub/kub.c
+++ b/kub/kub.c
@@ -18,10 +18,10 @@ typedef struct deck {
     int num_cards;
 } deck_t;
 
-#define CARD_GROUP_MAX_CARDS 14
+#define CARD_GROUP_MAX_CARDS DECK_MAX_CARDS
 
 typedef struct card_group {
-    card_t cards[HAND_MAX_CARDS];
+    card_t cards[CARD_GROUP_MAX_CARDS];
     int num_cards;
 } card_group_t;
 
@@ -30,7 +30,7 @@ typedef struct card_group {
 typedef struct board {
     card_group_t groups[BOARD_MAX_CARD_GROUPS];
     int num_groups;
-} board_t
+} board_t;
 
 typedef struct player {
     card_group_t hand;
@@ -45,17 +45,17 @@ typedef struct game {
     deck_t deck;
 } game_t;
 
-void card_print(card_t card)
+static void card_print(card_t card)
 {
     printf("%6s %2d\n", colors[card.color], card.number + 1);
 }
 
-void card_group_init(card_group_t *card_group)
+static void card_group_init(card_group_t *card_group)
 {
     card_group->num_cards = 0;
 }
 
-void board_init(board_t *board)
+static void board_init(board_t *board)
 {
     int i;
     board->num_groups = 0;
@@ -66,36 +66,51 @@ void board_init(board_t *board)
     }
 }
 
-void player_init(player_t *player)
+static void player_init(player_t *player)
 {
     card_group_init(&player->hand);
 }
 
-void game_init(game_t *game)
+static int card_group_is_run(card_group_t *card_group)
 {
     int i;
-    game->num_players = 0
-       
-       for (i = 0; i < GAME_MAX_PLAYERS; ++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)
        {
-           player_init(&game->players[i]);
-           game->num_players += 1;
+           return 0;
        }
-    
-    board_init(&game->board);
-    deck_init(&game->deck);
-    deck_shuffle(&game->deck);
+       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;
 }
 
-int card_group_is_set(card_group_t *card_group)
+
+static int card_group_is_set(card_group_t *card_group)
 {
-    int i, j;
-    color_t seen_color[card_group->num_cards]
-       
-       if (card_group->num_cards > 4 || card_group->num_cards < 3)
-       {
-           return 0;
-       }
+    int i;
+    color_t seen_color[card_group->num_cards];
+    
+    if (card_group->num_cards > 4 || card_group->num_cards < 3)
+    {
+       return 0;
+    }
     for (i = 0; i < card_group->num_cards - 1; ++i) 
     {
        if (card_group->cards[i].number != card_group->cards[i + 1].number)
@@ -106,29 +121,35 @@ 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)
     {
-       color_t color;
-       
        seen_color[card_group->cards[i].color]++;
+       if (seen_color[card_group->cards[i].color] > 1)
+       {
+           return 0;
+       }
     }
     return 1;
 }
 
-void deck_deal(deck_t *deck)
+#if 0
+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
 
-
-void deck_init(deck_t *deck)
+static void deck_init(deck_t *deck)
 {
     int h, i, j;  
     deck->num_cards = 0;
@@ -141,12 +162,13 @@ 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);
            }
        }
     }
 } 
 
-void deck_shuffle(deck_t *deck)
+static void deck_shuffle(deck_t *deck)
 {
     card_t temp;
     int rand_card;
@@ -160,7 +182,7 @@ void deck_shuffle(deck_t *deck)
     }
 }
 
-void deck_print(deck_t *deck)
+static void deck_print(deck_t *deck)
 {
     int h, i, j;  
     for (h = 0; h <= 1; ++h)
@@ -173,20 +195,34 @@ void deck_print(deck_t *deck)
            }
        }
     }
+    printf ("There are %d tiles in the deck\n" , deck->num_cards);
 }
 
-int main()
+static void game_init(game_t *game)
 {
-#define MAX_PLAYERS 4
-#define HANDSIZE 14
-#define PLAYERS 4
+    int i;
+    game->num_players = 0;
     
-    deck_t deck;
+    for (i = 0; i < GAME_MAX_PLAYERS; ++i)
+    {
+       player_init(&game->players[i]);
+       game->num_players += 1;
+    }
+    
+    board_init(&game->board);
+    deck_init(&game->deck);
+    deck_shuffle(&game->deck);
+}
+
+int main(void)
+{
+    game_t game;
     
     srand(time(NULL));
     
     game_init(&game);
-    deck_print(&deck);
+    deck_print(&game.deck);
     
     return 0;
     
+}