Deleted debugging code and changed return errors to fit protocol

[ttt] / src / ttt-board.c

diff --git a/src/ttt-board.c b/src/ttt-board.c
index 582b85fd6469e7cbcc1d460eb02dc50ef51684b6..f7a425eeb1ed813e8ad56e30cab35ab50af632ac 100644 (file)
--- a/src/ttt-board.c
+++ b/src/ttt-board.c
@@ -19,16 +19,17 @@
  * Author: Carl Worth <cworth@cworth.org>
  */
 
  * Author: Carl Worth <cworth@cworth.org>
  */
 

+#include <stdio.h>

 #include "ttt-board.h"
 
 /* Initialize an empty board. */
 void
 ttt_board_init (ttt_board_t *board)
 {
 #include "ttt-board.h"
 
 /* Initialize an empty board. */
 void
 ttt_board_init (ttt_board_t *board)
 {

-  int i;
-  for (i = 0; i < TTT_BOARD_MAX_CELLS; i++)
+    int i;
+    for (i = 0; i < TTT_BOARD_MAX_CELLS; i++)

     {
     {

-      board->cells[i] = 0;
+       board->cells[i] = TTT_CELL_EMPTY;

     }
 }
 
     }
 }
 


@@ -54,7 +55,15 @@ ttt_board_init_from_string (ttt_board_t *board,
 char *
 ttt_board_to_string (ttt_board_t *board)
 {
 char *
 ttt_board_to_string (ttt_board_t *board)
 {

-    /* XXX: NYI */
+    char *s;
+    xasprintf (&s, "\r\n" 
+              "%c|%c|%c\r\n"
+              "%c|%c|%c\r\n"
+              "%c|%c|%c",
+              board->cells[0], board->cells[1], board->cells[2], 
+              board->cells[3], board->cells[4], board->cells[5], 
+              board->cells[6], board->cells[7], board->cells[8]); 
+    return s;

 }
 
 /* Write a string representation of a board to the provided file.
 }
 
 /* Write a string representation of a board to the provided file.


@@ -74,3 +83,32 @@ ttt_board_write (ttt_board_t *board, FILE *file)
     free (s);
 }
 
     free (s);
 }
 

+/* Makes a new move in the given board.
+ *
+ * The move value is a number from 0 to 9 giving the position to be
+ * moved as follows:
+ * 
+ *  0|1|2
+ *  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.
+ */
+
+ 
+ttt_error_t ttt_board_make_move (ttt_board_t *board, int move)
+{                                    
+    if (board->cells[move] == '_')
+    {
+       board->cells[move] = 'X';
+       return(TTT_ERROR_NONE);
+    }
+    else
+    {
+       return(TTT_ERROR_NOT_VALID_MOVE);
+    }
+}