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

diff --git a/tictactoe.js b/tictactoe.js
index f9b357b..7d7450c 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;
   }
@@ -25,20 +33,11 @@ class TicTacToe extends Game {
   broadcast_move(square) {
     this.broadcast_event("move", square);
   }
-
-  handle_events(request, response) {
-    super.handle_events(request, response);
-
-    /* When a new client joins, replay all previous moves to it. */
-    for (let move of this.moves) {
-      response.write(`event: move\ndata: ${move}\n\n`);
-    }
-  }
 }
 
 router.post('/move', (request, response) => {
   const game = request.game;
-  const square = request.body.square;
+  const square = request.body.move;
 
   const legal = game.add_move(square);
 
@@ -52,12 +51,6 @@ router.post('/move', (request, response) => {
   game.broadcast_move(square);
 });
 
-router.get('/events', (request, response) => {
-  const game = request.game;
-
-  game.handle_events(request, response);
-});
-
 exports.router = router;
 exports.Game = TicTacToe;