X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=638fb12e3a2380976d3a090d25874a76050a719d;hb=601bb3548edeb1e5ac45e2d407befa5e7398c2f9;hp=aec86bee557348ae318c7614bf8a7fa6dc6a9889;hpb=de58f6c53ee85cf0db3bbed62101901f651db108;p=kub

diff --git a/kub.c b/kub.c
index aec86be..638fb12 100644
--- a/kub.c
+++ b/kub.c
@@ -80,7 +80,39 @@ 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)
+
+/* 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_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;
@@ -91,7 +123,7 @@ static int card_group_is_run(card_group_t *card_group)
 	return 0;
     }
 
-    run_color = card_group->cards[i].color;
+    run_color = card_group->cards[0].color;
 
     for (i = 0; i < card_group->num_cards; i++)
     {