X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=65b7d3e593d9c38e65409061b792c784f8b9bc49;hb=128be2d8da52865131653f197c05dd5f6830958a;hp=69be1d22e989480c196e2a3b1f708d0efdb89892;hpb=388d3ca2a4b0f2d2ff5c0f06f5fd32241475c4dd;p=kub

diff --git a/kub.c b/kub.c
index 69be1d2..65b7d3e 100644
--- a/kub.c
+++ b/kub.c
@@ -191,21 +191,27 @@ static int tile_group_is_run_one(tile_group_t *tile_group)
 {
     int i;
     qsort (&tile_group->tiles[0], tile_group->num_tiles,
-	   sizeof (tile_t), tile_compare);
-	   
+        sizeof (tile_t), tile_compare);
+    
     if (tile_group->num_tiles > 13 || tile_group->num_tiles < 3)
     {
-	return 0;
+        printf("fail run - invalid num tiles; ");
+        return 0;
     }
     for (i = 0; i < tile_group->num_tiles - 1; ++i)
-	if(tile_group->tiles[i].color != tile_group->tiles[i + 1].color)
-	{
-	    return 0;
-	}
-	if(tile_group->tiles[i].number != tile_group->tiles[i + 1].number -1)
-	{
-	    return 0;
-	}
+    {
+        if(tile_group->tiles[i].color != tile_group->tiles[i + 1].color)
+        {
+            printf("fail run - colors don't match; ");
+            return 0;
+        }
+        if( tile_group->tiles[i].number != tile_group->tiles[i + 1].number -1 &&
+            i+1 != tile_group->num_tiles)
+        {
+            printf("fail run - invalid number sequence; ");
+            return 0;
+        }
+    }
     return 1;
 }
 
@@ -275,27 +281,32 @@ static int tile_group_is_run_two(tile_group_t *tile_group)
 static int tile_group_is_set(tile_group_t *tile_group)
 {
     int i;
-    color_t seen_color[tile_group->num_tiles];
+    color_t seen_color[4];
+    for (i = 0; i < 4; i++)
+        seen_color[i] = 0;
     
     if (tile_group->num_tiles > 4 || tile_group->num_tiles < 3)
     {
-	return 0;
+        printf("fail set - invalid num tiles; ");
+        return 0;
     }
-    for (i = 0; i < tile_group->num_tiles - 1; ++i) 
+    for (i = 0; i <= tile_group->num_tiles - 1; ++i) 
     {
-	if (tile_group->tiles[i].number != tile_group->tiles[i + 1].number)
-	{
-	    return 0;
-	}
+        if (tile_group->tiles[i].number != tile_group->tiles[i + 1].number &&
+            i+1 != tile_group->num_tiles)
+        {
+            printf("fail set - numbers don't match; ");
+            return 0;
+        }
+        seen_color[tile_group->tiles[i].color] += 1;
     }
-    seen_color[i] = tile_group->tiles[i].color;
-    for (i = 0; i < tile_group->num_tiles; ++i)
+    for (i = 0; i < 4; i++)
     {
-	seen_color[tile_group->tiles[i].color]++;
-	if (seen_color[tile_group->tiles[i].color] > 1)
-	{
-	    return 0;
-	}
+        if (seen_color[i] > 1)
+        {
+            printf("fail set - repeat color; ");
+            return 0;
+        }
     }
     return 1;
 }
@@ -521,12 +532,13 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
                 group.num_tiles++;
             }
         }
+        printf("is run %d\n", tile_group_is_run_one(&group) );
+        printf("is set %d\n", tile_group_is_set(&group) );
         for (i = 0; i < group.num_tiles; i++)
             tile_print(group.tiles[i]);
     }
     
     game->current_tile = -1;
-    printf ("You released button %d\n", event->button);
 
     return TRUE;
 }