X-Git-Url: https://git.cworth.org/git?p=kub;a=blobdiff_plain;f=kub.c;fp=kub.c;h=cf3c8958872d90d99df54dc78abd18ebc51ab723;hp=92cc533fdc74f6ae46c4e9879b9cb2a7928f3a09;hb=80d1bc0be0fd7f098e3c5a1928bb3691b43fe051;hpb=8a3a5d075300ac2fa9827f7c5a94906b10598863

diff --git a/kub.c b/kub.c
index 92cc533..cf3c895 100644
--- a/kub.c
+++ b/kub.c
@@ -75,12 +75,38 @@ static void player_init(player_t *player)
 }
 
 
+/* If card_one < card_two, then return value will be negative
+   if they are equal, 0 will be returned,
+   if card_one > card_two, then return value will be positive */
 static int card_compare(card_t *card_one, card_t *card_two)
 {
     return card_one->number - card_two->number;
 }
 
-static int card_group_is_run(card_group_t *card_group)
+static int card_group_is_run_one(card_group_t *card_group)
+{
+    int i;
+    qsort (&card_group->cards[0], card_group->num_cards,
+	   sizeof (card_t), card_compare);
+	   
+    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 != card_group->cards[i + 1].number -1)
+	{
+	    return 0;
+	}
+    return 1;
+}
+
+
+static int card_group_is_run_two(card_group_t *card_group)
 {
     int i;
     int lowest = 14, highest = 0;
@@ -99,7 +125,8 @@ static int card_group_is_run(card_group_t *card_group)
     /* Loop through all cards in the group, ensuring that they are all
      * the same color and finding the highest and lowest number in the
      * group. */
-    run_color = card_group->cards[i].color;
+    run_color = card_group->cards[0].color;
+
     for (i = 0; i < card_group->num_cards; i++)
     {
 	if (card_group->cards[i].color != run_color)