Beautified _board_is_won and test_board.c now quits out when won

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"
 
-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)
@@ -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);
+       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 \"");

diff --git a/src/ttt-board.c b/src/ttt-board.c
index c6d36f0b42ba161c6070b01a8c7ef5f8e16826c0..73d2741c4c446a3386a634824178e6b1d04bfb59 100644 (file)
--- a/src/ttt-board.c
+++ b/src/ttt-board.c
@@ -104,22 +104,33 @@ ttt_error_t ttt_board_make_move (ttt_board_t *board, int move)
        return TTT_ERROR_NOT_VALID_MOVE;
 
     board->cells[move] = board->current_player;
-
+    
     if (board->current_player == TTT_CELL_X)
-    {
-       ttt_board_is_won (board);
        board->current_player = TTT_CELL_O;     
-    }
     else
-    {
-       ttt_board_is_won (board);
        board->current_player = TTT_CELL_X;
-    }
     return TTT_ERROR_NONE;
 }
 
+/* Checks to see if a player has won the game and should be called after every move.
+ * 
+ * Returns: TTT_CELL_X if X's win. TTT_CELL_O if O's win.
+ * The game can then check the value of the return and declare the winner. 
+ */
 
-
-
-
-
+ttt_cell_t ttt_board_is_won (ttt_board_t *board)
+{
+    int i;
+    for (i = 0; i <= 2; i++)
+    {
+       if (board->cells[i] != TTT_CELL_EMPTY && board->cells[i] == board->cells[i + 3] && board->cells[i] == board->cells[i + 6])
+           return(board->cells[i]);
+       else if (board->cells[i * 3] != TTT_CELL_EMPTY && board->cells[i * 3] == board->cells[(i * 3) + 1] && board->cells[i * 3] == board->cells[(i * 3) + 2])
+           return(board->cells[i * 3]);
+    }
+    if (board->cells[0] != TTT_CELL_EMPTY && board->cells[0] == board->cells[4] && board->cells[0]== board->cells[8])
+       return(board->cells[0]);
+    if (board->cells[2] != TTT_CELL_EMPTY && board->cells[2] == board->cells[4] && board->cells[2]== board->cells[6])
+       return(board->cells[2]);
+    return(TTT_CELL_EMPTY);
+}

diff --git a/src/ttt-board.h b/src/ttt-board.h
index 0b7723d2108b7aca712ade450288cdfd46269653..8983568731520cb7d9e9028a8f467df482b03055 100644 (file)
--- a/src/ttt-board.h
+++ b/src/ttt-board.h
@@ -54,7 +54,7 @@ ttt_board_write (ttt_board_t *board, FILE *file);
 ttt_error_t
 ttt_board_make_move (ttt_board_t *board, int move);
 
-int
+ttt_cell_t
 ttt_board_is_won (ttt_board_t *board);
 
 #endif