Second draft attempt at ttt_board_is_won

[ttt] / src / test-board.c

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"
 
-int ttt_board_is_won (ttt_board_t *board);
-
 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);
+    }
     else
        return(0);
 }