Fix gameInfo.mycolor in BaseGame

[vchess.git] / client / src / components / BaseGame.vue

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index aa19b47..c980400 100644 (file)
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -6,8 +6,9 @@
       .card.smallpad.small-modal.text-center
         label.modal-close(for="modalEog")
         h3#eogMessage.section {{ endgameMessage }}
-    Board(:vr="vr" :last-move="lastMove" :analyze="analyze" :user-color="mycolor"
-      :orientation="orientation" :vname="vname" @play-move="play")
+    Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
+      :user-color="gameInfo.mycolor" :orientation="orientation"
+      :vname="vname" @play-move="play")
     .button-group
       button(@click="() => play()") Play
       button(@click="() => undo()") Undo
@@ -38,13 +39,15 @@ export default {
     //MoveList,
   },
   // "vr": VariantRules object, describing the game state + rules
-  props: ["vname","analyze","vr","fenStart","players","mycolor"],
+  // fenStart, players, mycolor
+  props: ["vname","analyze","vr","gameInfo"],
   data: function() {
     return {
       st: store.state,
       // NOTE: all following variables must be reset at the beginning of a game
       endgameMessage: "",
       orientation: "w",
+      // TODO: score and moves could be also in gameInfo (when resuming)
       score: "*", //'*' means 'unfinished'
       moves: [],
       cursor: -1, //index of the move just played
@@ -53,10 +56,10 @@ export default {
   },
   watch: {
     // fenStart changes when a new game starts
-    fenStart: function() {
+    "gameInfo.fenStart": function() {
       // Reset all variables
       this.endgameMessage = "";
-      this.orientation = this.mycolor;
+      this.orientation = this.gameInfo.mycolor || "w";
       this.score = "*";
       this.moves = [];
       this.cursor = -1;
@@ -112,8 +115,8 @@ export default {
       pgn += '[Site "vchess.club"]\n';
       pgn += '[Variant "' + this.vname + '"]\n';
       pgn += '[Date "' + getDate(new Date()) + '"]\n';
-      pgn += '[White "' + this.players[0] + '"]\n';
-      pgn += '[Black "' + this.players[1] + '"]\n';
+      pgn += '[White "' + this.game.players[0] + '"]\n';
+      pgn += '[Black "' + this.game.players[1] + '"]\n';
       pgn += '[Fen "' + this.fenStart + '"]\n';
       pgn += '[Result "' + this.score + '"]\n\n';
       let counter = 1;