X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tictactoe.js;h=74cf3436334f214123981d8698b17b0cacf8ae21;hb=bceb4cb3eb1b150aedc562978df01cb0ac4ce628;hp=f9b357bf3202dfbc84443818dbd3626958e5f307;hpb=4a744b0425333284979ef76206c457ff7dcf5907;p=empires-server

diff --git a/tictactoe.js b/tictactoe.js
index f9b357b..74cf343 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -6,18 +6,26 @@ const router = express.Router();
 class TicTacToe extends Game {
   constructor(id) {
     super(id);
-    this.moves = [];
-    this.board = Array(9).fill("");
+    this.state = {
+      moves: [],
+      board: Array(9).fill(""),
+      next_player: "X",
+    };
   }
 
   /* Returns Boolean indicating whether move was legal and added. */
   add_move(square) {
     /* Cannot move to an occupied square. */
-    if (this.board[square])
+    if (this.state.board[square])
       return false;
 
-    this.board[square] = 'X';
-    this.moves.push(square);
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
+
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
+    else
+      this.state.next_player = "X";
 
     return true;
   }
@@ -30,7 +38,7 @@ class TicTacToe extends Game {
     super.handle_events(request, response);
 
     /* When a new client joins, replay all previous moves to it. */
-    for (let move of this.moves) {
+    for (let move of this.state.moves) {
       response.write(`event: move\ndata: ${move}\n\n`);
     }
   }