]> git.cworth.org Git - kub/commitdiff
Merge branch 'master' of kevin:kub
authorCarl Worth <cworth@cworth.org>
Wed, 14 Feb 2007 17:01:59 +0000 (09:01 -0800)
committerCarl Worth <cworth@cworth.org>
Wed, 14 Feb 2007 17:01:59 +0000 (09:01 -0800)
Conflicts:

kub.c

1  2 
kub.c

diff --cc kub.c
index 92cc533fdc74f6ae46c4e9879b9cb2a7928f3a09,88b678e3ef6e619a05e76a32be414d69877480d8..cf3c8958872d90d99df54dc78abd18ebc51ab723
--- 1/kub.c
--- 2/kub.c
+++ b/kub.c
@@@ -96,10 -117,8 +122,11 @@@ static int card_group_is_run_two(card_g
        return 0;
      }
  
-     run_color = card_group->cards[i].color;
 +    /* 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[0].color;
      for (i = 0; i < card_group->num_cards; i++)
      {
        if (card_group->cards[i].color != run_color)