X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Ftest-board.c;h=89af8719bd53772147cf8becc4c343a5872a44ee;hp=abdb01b2f92807d58fe4eb8ea6d5539aa26292be;hb=7768c01e9aeec334dd3d5851fc2d1298317060dc;hpb=509e7fd528db9f7b1224b82aa955c978076dc2e5

diff --git a/src/test-board.c b/src/test-board.c
index abdb01b..89af871 100644
--- a/src/test-board.c
+++ b/src/test-board.c
@@ -2,45 +2,46 @@
 
 #include "ttt-board.h"
 
-ttt_cell_t ttt_test_board_is_won (ttt_board_t *board);
-
 int
 main (void)
 {
     ttt_board_t board;
     int m, i, newline;
-
+    ttt_cell_t winner;
+    
     ttt_board_init (&board);
     
-    for (i = 0; i <= 8; i++)
+    i = 0; while (i < 9)
     {
-	printf ("This is the board \"");
 	ttt_board_write (&board, stdout);
-	printf ("\"\n");    
-
-	printf ("Make a move \n");
+	printf ("\n");    
+	
+	printf ("Make a move ");
 	m = getchar();
 	newline = getchar();
-	printf ("getchar returned a numeric value of %d which is character '%c'\n", m, m);
 	m = m - '0';
-	ttt_board_make_move (&board, m);
-	ttt_board_is_won (&board);
-	if (ttt_board_is_won (&board) == TTT_CELL_X)
+	if (ttt_board_make_move (&board, m) == TTT_ERROR_NOT_VALID_MOVE)
+	    continue;
+	winner = ttt_board_is_won (&board);
+	if (winner == TTT_CELL_X)
 	{
 	    printf ("X's Win! ");
 	    break;
 	}
-	else if (ttt_board_is_won (&board) == TTT_CELL_O)
+	else if (winner == TTT_CELL_O)
 	{
 	    printf ("O's Win! ");
 	    break;
 	}
+	else if (i == 8)
+	{
+	    printf ("Cat's Game!");
+	    break;
+	}
+	i++;
     }
-
-    printf ("This is the board \"");
+    
     ttt_board_write (&board, stdout);
-    printf ("\"\n");    
-
-
+    printf ("\n");    
     return 0;
 }