2005-12-13 Carl Worth <cworth@cworth.org>

[ttt] / src / ttt-board.c

diff --git a/src/ttt-board.c b/src/ttt-board.c
index ae1643833ab7df8b0b32d1f99267bb49f174de54..92391ebd2d7db4243ed14f76ff7253fa2c9a963f 100644 (file)
--- a/src/ttt-board.c
+++ b/src/ttt-board.c
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include "ttt-board.h"
+#include "ttt-error.h"
 
 /* Initialize an empty board. */
 void
@@ -31,6 +32,7 @@ ttt_board_init (ttt_board_t *board)
     {
        board->cells[i] = TTT_CELL_EMPTY;
     }
+    board->current_player = TTT_CELL_X;
 }
 
 /* Initialize a board from its string representation.
@@ -92,7 +94,7 @@ ttt_board_write (ttt_board_t *board, FILE *file)
  *  3|4|5
  *  6|7|8
  *
- * Returns: 1 if a move isa made succesfully. O if a move is invalid
+ * 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,
@@ -100,17 +102,23 @@ ttt_board_write (ttt_board_t *board, FILE *file)
  */
 
  
-int ttt_board_make_move (ttt_board_t *board, int move)
-{                                    
-    
-    putchar(move);
-    if (board->cells[move] == '_')
-    {
-       board->cells[move] = 'X';
-       return(1);
-    }
+ttt_error_t ttt_board_make_move (ttt_board_t *board, int move)
+{  
+    if (board->cells[move] != '_')
+       return TTT_ERROR_NOT_VALID_MOVE;
+
+    board->cells[move] = board->current_player;
+
+    if (board->current_player == TTT_CELL_X)
+       board->current_player = TTT_CELL_O;     
     else
-    {
-       return(0);
-    }
+       board->current_player = TTT_CELL_X;
+
+    return TTT_ERROR_NONE;
 }
+
+
+
+
+
+