General Maintenance

[ttt] / src / test-board.c

diff --git a/src/test-board.c b/src/test-board.c
index 4630a19e69030ac0744db10581c2b3ab64258e01..463e1b9eec267a35ef6cf17b8614477d5b5e5a59 100644 (file)
--- a/src/test-board.c
+++ b/src/test-board.c
@@ -2,26 +2,6 @@
 
 #include "ttt-board.h"
 
-int ttt_board_is_won (ttt_board_t *board);
-
-int ttt_board_is_won (ttt_board_t *board)
-{
-    if (
-       board->cells[0] == board->cells[3] && board->cells[3] == board->cells[6] ||
-       board->cells[1] == board->cells[4] && board->cells[4] == board->cells[7] ||
-       board->cells[2] == board->cells[5] && board->cells[5] == board->cells[8] ||
-       board->cells[0] == board->cells[1] && board->cells[1] == board->cells[2] ||
-       board->cells[3] == board->cells[4] && board->cells[4] == board->cells[5] ||
-       board->cells[6] == board->cells[7] && board->cells[7] == board->cells[8] ||
-       board->cells[0] == board->cells[4] && board->cells[4] == board->cells[8] ||
-       board->cells[2] == board->cells[4] && board->cells[4] == board->cells[6] 
-       )
-/*     printf ("'board->current_player''s Win!") */
-       return(1);
-    else
-       return(0);
-}
-
 int
 main (void)
 {
@@ -32,22 +12,28 @@ main (void)
     
     for (i = 0; i <= 8; i++)
     {
-       printf ("This is the board \"");
        ttt_board_write (&board, stdout);
-       printf ("\"\n");    
+       printf ("\n");    
 
-       printf ("Make a move \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)
+       {
+           printf ("X's Win! ");
+           break;
+       }
+       else if (ttt_board_is_won (&board) == TTT_CELL_O)
+       {
+           printf ("O's Win! ");
+           break;
+       }
     }
 
-    printf ("This is the board \"");
     ttt_board_write (&board, stdout);
-    printf ("\"\n");    
-
-
+    printf ("\n");    
     return 0;
 }