X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tictactoe.js;h=476821eec57039d5735fab0b8f4f021f5d8c5cad;hb=c381788fa303d9ca392fc4b7b25c4d55344717da;hp=35019840cc13a68fa225482610876e9c5c3b5932;hpb=16564f558ee42c3fbc0ca5ee56c91407253747b5;p=empires-server

diff --git a/tictactoe.js b/tictactoe.js
index 3501984..476821e 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -4,27 +4,47 @@ const Game = require("./game.js");
 class TicTacToe extends Game {
   constructor(id) {
     super(id);
+    this.teams = [
+      {
+        id: 0,
+        name: "X"
+      },
+      {
+        id: 1,
+        name: "O"
+      }];
     this.state = {
       moves: [],
       board: Array(9).fill(""),
-      next_player: "X",
+      team_to_play: this.teams[0],
     };
-    this.teams = ["X", "O"];
   }
 
   /* Returns true if move was legal and added, false otherwise. */
-  add_move(square) {
+  add_move(player, square) {
+
+    const state = this.state;
+    const result = super.add_move(player, square);
+
+    /* If the generic Game class can reject this move, then we don't
+     * need to look at it any further. */
+    if (! result.legal)
+      return result;
+
     /* Cannot move to an occupied square. */
-    if (this.state.board[square])
-      return { legal: false, message: "Square is already occupied" };
+    if (state.board[square])
+    {
+      return { legal: false,
+               message: "Square is already occupied" };
+    }
 
-    this.state.board[square] = this.state.next_player;
-    this.state.moves.push(square);
+    state.board[square] = state.team_to_play;
+    state.moves.push(square);
 
-    if (this.state.next_player === "X")
-      this.state.next_player = "O";
+    if (state.team_to_play.id === 0)
+      state.team_to_play = this.teams[1];
     else
-      this.state.next_player = "X";
+      state.team_to_play = this.teams[0];
 
     return { legal: true };
   }