Second draft attempt at ttt_board_is_won

[ttt] / src / ttt-board.c

diff --git a/src/ttt-board.c b/src/ttt-board.c
index 64443155e5baa06aa5426d564970216f957ae3a6..dfddf35ec168297011979468231596785870dafd 100644 (file)
--- a/src/ttt-board.c
+++ b/src/ttt-board.c
@@ -94,32 +94,26 @@ ttt_board_write (ttt_board_t *board, FILE *file)
  *  3|4|5
  *  6|7|8
  *
- * Returns: 1 if a move is made succesfully. O if a move is invalid
- * (the given cell is not empty).
- *
- * Bugs: Currently this function always places X for all moves. So,
- * yeah, we'll need to fix that.
+ * Returns: TTT_ERROR_NONE if a move is made succesfully. TTT_ERROR_NOT_VALID_MOVE
+ * if a move is invalid (the given cell is not empty).
  */
 
- 
 ttt_error_t ttt_board_make_move (ttt_board_t *board, int move)
 {  
-    if (board->cells[move] != '_')
-    {
-       return(TTT_ERROR_NOT_VALID_MOVE);
-    }
+    if (board->cells[move] != TTT_CELL_EMPTY)
+       return TTT_ERROR_NOT_VALID_MOVE;
+
+    board->cells[move] = board->current_player;
 
     if (board->current_player == TTT_CELL_X)
-    {       
-       board->cells[move] = 'X';
+    {
+       ttt_board_is_won (board);
        board->current_player = TTT_CELL_O;     
     }
     else
-    {
-       board->cells[move] = 'O';
        board->current_player = TTT_CELL_X;
-    }
-    return(TTT_ERROR_NONE);
+    
+    return TTT_ERROR_NONE;
 }