General Maintenance

[ttt] / src / ttt-board.c

diff --git a/src/ttt-board.c b/src/ttt-board.c
index 73d2741c4c446a3386a634824178e6b1d04bfb59..273702185d8695ab312ef68275fcd4fecdcd3d1f 100644 (file)
--- a/src/ttt-board.c
+++ b/src/ttt-board.c
@@ -112,25 +112,51 @@ ttt_error_t ttt_board_make_move (ttt_board_t *board, int move)
     return TTT_ERROR_NONE;
 }
 
-/* Checks to see if a player has won the game and should be called after every move.
+/* 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. 
+ * Returns: TTT_CELL_X if X's win. TTT_CELL_O if O's
+ * win. TTT_CELL_EMPTY if no 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++)
+
+    /* Loop over rows and columns looking for a win. */
+    for (i = 0; i < 3; i++)
+    {
+       /* Check the current column */
+       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];
+       }
+       
+       /* Check the current row */
+       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])
     {
-       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]);
+       return board->cells[0];
     }
-    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);
+
+    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;
 }