X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=1e7a83bbde1cf9adca2644ad1ab4b62525b01f49;hb=13aa5a44fe3da4eac5ab04f0120ccbd5927f91c1;hp=287521816237370181e2d14af5f636e23c9cca87;hpb=37cdcbf303d3c2e57b388a1abc9f853ba68a55cd;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 28752181..1e7a83bb 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -38,13 +38,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
@@ -56,12 +58,19 @@ export default {
     fenStart: function() {
       // Reset all variables
       this.endgameMessage = "";
-      this.orientation = this.mycolor;
+      this.orientation = this.gameInfo.mycolor || "w";
       this.score = "*";
       this.moves = [];
       this.cursor = -1;
       this.lastMove = null;
     },
+    analyze: function() {
+      if (this.analyze)
+      {
+        // Switched to analyze mode: game is over
+        this.endGame("*");
+      }
+    },
   },
   computed: {
     showMoves: function() {
@@ -105,8 +114,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;
@@ -127,7 +136,7 @@ export default {
     },
     showScoreMsg: function(score) {
       this.setEndgameMessage(score);
-      let modalBox = document.getElementById("modal-eog");
+      let modalBox = document.getElementById("modalEog");
       modalBox.checked = true;
       setTimeout(() => { modalBox.checked = false; }, 2000);
     },
@@ -215,7 +224,8 @@ export default {
         else //just show score on screen (allow undo)
           this.showScoreMsg(score);
       }
-      this.$emit("newmove", move); //post-processing (e.g. computer play)
+      if (!this.analyze)
+        this.$emit("newmove", move); //post-processing (e.g. computer play)
     },
     undo: function(move) {
       let navigate = !move;
@@ -231,7 +241,7 @@ export default {
       if (this.st.settings.sound == 2)
         new Audio("/sounds/undo.mp3").play().catch(err => {});
       this.incheck = this.vr.getCheckSquares(this.vr.turn);
-      if (this.analyze) //TODO: can this happen?
+      if (!navigate)
         this.moves.pop();
     },
     gotoMove: function(index) {