Second draft attempt at ttt_board_is_won

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

-int ttt_board_is_won (ttt_board_t *board);
-

 int ttt_board_is_won (ttt_board_t *board)
 {
     if (
 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] 
+       (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 ("'board->current_player''s Win!") */
+    {
+       printf ("%c's Win! ", board->current_player);

        return(1);
        return(1);

+    }

     else
        return(0);
 }
     else
        return(0);
 }

diff --git a/src/ttt-board.c b/src/ttt-board.c
index 8c34b3e0074165300f35958e73be7637bde7081f..dfddf35ec168297011979468231596785870dafd 100644 (file)
--- a/src/ttt-board.c
+++ b/src/ttt-board.c
@@ -94,14 +94,10 @@ ttt_board_write (ttt_board_t *board, FILE *file)
  *  3|4|5
  *  6|7|8
  *
  *  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] != TTT_CELL_EMPTY)
 ttt_error_t ttt_board_make_move (ttt_board_t *board, int move)
 {  
     if (board->cells[move] != TTT_CELL_EMPTY)


@@ -110,10 +106,13 @@ ttt_error_t ttt_board_make_move (ttt_board_t *board, int move)
     board->cells[move] = board->current_player;
 
     if (board->current_player == TTT_CELL_X)
     board->cells[move] = board->current_player;
 
     if (board->current_player == TTT_CELL_X)

+    {
+       ttt_board_is_won (board);

        board->current_player = TTT_CELL_O;     
        board->current_player = TTT_CELL_O;     

+    }

     else
        board->current_player = TTT_CELL_X;
     else
        board->current_player = TTT_CELL_X;

-
+    

     return TTT_ERROR_NONE;
 }
 
     return TTT_ERROR_NONE;
 }
 

diff --git a/src/ttt-board.h b/src/ttt-board.h
index c75c168960f9ebac1e49dfc3f5c0863b82af0cf6..0b7723d2108b7aca712ade450288cdfd46269653 100644 (file)
--- a/src/ttt-board.h
+++ b/src/ttt-board.h
@@ -54,6 +54,9 @@ ttt_board_write (ttt_board_t *board, FILE *file);
 ttt_error_t
 ttt_board_make_move (ttt_board_t *board, int move);
 
 ttt_error_t
 ttt_board_make_move (ttt_board_t *board, int move);
 

+int
+ttt_board_is_won (ttt_board_t *board);
+

 #endif
 
 
 #endif