X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=src%2Fttt-board.c;h=f8f62e045de587631fa10c5c1caceee3a3fdecd0;hb=455fff921b278572c9ce0a1cd6c2d80630d21a42;hp=ae1643833ab7df8b0b32d1f99267bb49f174de54;hpb=64c557a29553e0d4235f95e10bb943533aa70b02;p=ttt

diff --git a/src/ttt-board.c b/src/ttt-board.c
index ae16438..f8f62e0 100644
--- 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,25 +94,67 @@ 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
- * (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).
  */
 
- 
-int ttt_board_make_move (ttt_board_t *board, int move)
-{                                    
+ttt_error_t ttt_board_make_move (ttt_board_t *board, int move)
+{  
+    if (board->cells[move] != TTT_CELL_EMPTY)
+	return TTT_ERROR_NOT_VALID_MOVE;
+
+    board->cells[move] = board->current_player;
     
-    putchar(move);
-    if (board->cells[move] == '_')
+    if (board->current_player == TTT_CELL_X)
+	board->current_player = TTT_CELL_O;	
+    else
+	board->current_player = TTT_CELL_X;
+    return TTT_ERROR_NONE;
+}
+
+/* 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. 
+ */
+
+ttt_cell_t ttt_board_is_won (ttt_board_t *board)
+{
+    int i;
+
+    /* Loop over rows and columns looking for a win. */
+    for (i = 0; i <= 2; i++)
     {
-	board->cells[move] = 'X';
-	return(1);
+	/* 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];
+	}
     }
-    else
+
+    if (board->cells[0] != TTT_CELL_EMPTY &&
+	board->cells[0] == board->cells[4] &&
+	board->cells[0]== board->cells[8])
     {
-	return(0);
+    	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;
 }