X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=aec86bee557348ae318c7614bf8a7fa6dc6a9889;hb=de58f6c53ee85cf0db3bbed62101901f651db108;hp=702d833f51c362888a0c70bd419ec187952c16f5;hpb=beceea8bc61ee3264f670c50ee41543886f0fc93;p=kub

diff --git a/kub.c b/kub.c
index 702d833..aec86be 100644
--- a/kub.c
+++ b/kub.c
@@ -77,47 +77,27 @@ static void player_init(player_t *player)
 
 static int card_compare(card_t *card_one, card_t *card_two)
 {
-    if (card_one->number < card_two->number)
-	return -1;
-    if (card_one->number == card_two->number)
-	return 0;
-    if (card_one->number > card_two->number)
-	return 1;
-}
-
-static int card_group_is_run(card_group_t *card_group)
-{
-    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;
-	}    
-    for (i = 0; i < card_group->num_cards - 1; ++i)
-	if(card_group->cards[i].number != card_group->cards[i + 1].number -1)
-	{
-	    return 0;
-	}
-    return 1;    
+    return card_one->number - card_two->number;
 }
 
 static int card_group_is_run(card_group_t *card_group)
 {
     int i;
     int lowest = 14, highest = 0;
+    color_t run_color;
+
     if (card_group->num_cards > 13 || card_group->num_cards < 3)
     {
 	return 0;
     }
-    for (i = 0; i < card_group->num_cards - 1; ++i)
+
+    run_color = card_group->cards[i].color;
+
+    for (i = 0; i < card_group->num_cards; i++)
     {
-	if (card_group->cards[i].color != card_group->cards[i + 1].color)
-	{
+	if (card_group->cards[i].color != run_color)
 	    return 0;
-	}
+
 	if (card_group->cards[i].number > highest)
 	{
 	    highest = card_group->cards[i].number;