X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=tictactoe%2Ftictactoe.jsx;h=3c7de0b014ca5481b5b64a46882032d29096b0ce;hb=ee68b32ca39f0b664de49cb23695d0786e987c2c;hp=a7614bcaf56168424da88827830cfbbea54be6c9;hpb=79ef861f4341e20501e9c540f9ed9c81ba52204b;p=lmno.games

diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index a7614bc..3c7de0b 100644
--- a/tictactoe/tictactoe.jsx
+++ b/tictactoe/tictactoe.jsx
@@ -90,7 +90,8 @@ function PlayerInfo(props) {
   return (
     <div className="player-info">
       <h2>Player</h2>
-      {props.name}, ID: {props.id}, on team: {props.team}
+      {props.name}, ID: {props.id},
+      {props.team ? ` on team ${props.team}` : " not on a team"}
     </div>
   );
 }
@@ -120,7 +121,7 @@ class Board extends React.Component {
     return (
       <Square
         value={value}
-        active={! this.props.game_over && ! value}
+        active={this.props.active && ! value}
         onClick={() => this.props.onClick(i)}
       />
     );
@@ -252,28 +253,37 @@ class Game extends React.Component {
   }
 
   render() {
-    const history = this.state.history;
-    const current = history[this.state.step_number];
+    const state = this.state;
+    const history = state.history;
+    const current = history[state.step_number];
     const winner = calculate_winner(current.squares);
+    var board_active;
 
     let status;
     if (winner) {
       status = "Winner: " + winner;
+      board_active = false;
     } else {
-      status = "Next player: " + (Team.properties[this.state.next_to_play].name);
+      if (state.player_info.team === Team.properties[state.next_to_play].name) {
+        status = "Your turn. Make a move.";
+        board_active = true;
+      } else {
+        status = "Waiting for your opponent to move.";
+        board_active = false;
+      }
     }
 
     return [
       <GameInfo
         key="game-info"
-        id={this.state.game_info.id}
-        url={this.state.game_info.url}
+        id={state.game_info.id}
+        url={state.game_info.url}
       />,
       <PlayerInfo
         key="player-info"
-        id={this.state.player_info.id}
-        name={this.state.player_info.name}
-        team={this.state.player_info.team}
+        id={state.player_info.id}
+        name={state.player_info.name}
+        team={state.player_info.team}
       />,
       <div key="game" className="game">
         <button className="inline"
@@ -284,7 +294,7 @@ class Game extends React.Component {
         <div>{status}</div>
         <div className="game-board">
           <Board
-            game_over={winner}
+            active={board_active}
             squares={current.squares}
             onClick={i => this.handle_click(i)}
           />