Beautified _board_is_won and test_board.c now quits out when won

[ttt] / src / test-board.c

diff --git a/src/test-board.c b/src/test-board.c
index 313573528a0c156a57c59351ee39409bd7fbe2b9..abdb01b2f92807d58fe4eb8ea6d5539aa26292be 100644 (file)
--- a/src/test-board.c
+++ b/src/test-board.c
@@ -2,25 +2,7 @@
 
 #include "ttt-board.h"
 
 
 #include "ttt-board.h"
 

-int ttt_board_is_won (ttt_board_t *board)
-{
-    if (
-       (board->cells[0] == board->cells[3] && board->cells[3] == board->cells[6] && board->cells[0] != TTT_CELL_EMPTY) ||
-       (board->cells[1] == board->cells[4] && board->cells[4] == board->cells[7] && board->cells[1] != TTT_CELL_EMPTY) ||
-       (board->cells[2] == board->cells[5] && board->cells[5] == board->cells[8] && board->cells[2] != TTT_CELL_EMPTY) ||
-       (board->cells[0] == board->cells[1] && board->cells[1] == board->cells[2] && board->cells[0] != TTT_CELL_EMPTY) ||
-       (board->cells[3] == board->cells[4] && board->cells[4] == board->cells[5] && board->cells[3] != TTT_CELL_EMPTY) ||
-       (board->cells[6] == board->cells[7] && board->cells[7] == board->cells[8] && board->cells[6] != TTT_CELL_EMPTY) ||
-       (board->cells[0] == board->cells[4] && board->cells[4] == board->cells[8] && board->cells[0] != TTT_CELL_EMPTY) ||
-       (board->cells[2] == board->cells[4] && board->cells[4] == board->cells[6] && board->cells[2] != TTT_CELL_EMPTY) 
-       )
-    {
-       printf ("%c's Win! ", board->current_player);
-       return(1);
-    }
-    else
-       return(0);
-}
+ttt_cell_t ttt_test_board_is_won (ttt_board_t *board);

 
 int
 main (void)
 
 int
 main (void)


@@ -42,6 +24,17 @@ main (void)
        printf ("getchar returned a numeric value of %d which is character '%c'\n", m, m);
        m = m - '0';
        ttt_board_make_move (&board, m);
        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 \"");
     }
 
     printf ("This is the board \"");