X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tictactoe.js;h=7b91a9bc34461158d41fd1d1495cdc84d33600c0;hb=2c93bc13fb20e23084671ca3dc92ce9ee3e33494;hp=8efc70f8e791fe20d1aa68233667516a52ed5af0;hpb=8adcf9df208ac8d303706f89d359f69bbdc0a7a2;p=empires-server

diff --git a/tictactoe.js b/tictactoe.js
index 8efc70f..7b91a9b 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -6,24 +6,26 @@ const router = express.Router();
 class TicTacToe extends Game {
   constructor(id) {
     super(id);
-    this.moves = [];
-    this.board = Array(9).fill("");
-    this.next_player = "X";
+    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] = this.next_player;
-    this.moves.push(square);
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
 
-    if (this.next_player === "X")
-      this.next_player = "O";
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
     else
-      this.next_player = "X";
+      this.state.next_player = "X";
 
     return true;
   }
@@ -35,10 +37,10 @@ class TicTacToe extends Game {
   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`);
-    }
+    /* When a new client joins, give them the current game state,
+     * (which includes the history of moves). */
+    const state_json = JSON.stringify(this.state);
+    response.write(`event: game-state\ndata: ${state_json}\n\n`);
   }
 }