X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FComputerGame.vue;h=a5e03b31025d2f6d0471d1ad3e44572be5d6d87f;hb=866842c3c310524c034922870234120ed2a16cbf;hp=402bc7fa8bc846a19043a1ec922e53995327f771;hpb=6808d7a16ec1e761c6a2dffec2281c96953e4d89;p=vchess.git

diff --git a/client/src/components/ComputerGame.vue b/client/src/components/ComputerGame.vue
index 402bc7fa..a5e03b31 100644
--- a/client/src/components/ComputerGame.vue
+++ b/client/src/components/ComputerGame.vue
@@ -1,5 +1,11 @@
 <template lang="pug">
-BaseGame(:game="game" :vr="vr" @newmove="processMove" @gameover="gameOver")
+BaseGame(
+  ref="basegame"
+  :game="game"
+  :vr="vr"
+  @newmove="processMove"
+  @gameover="gameOver"
+)
 </template>
 
 <script>
@@ -29,14 +35,7 @@ export default {
     "gameInfo.fen": function() {
       this.launchGame();
     },
-    "gameInfo.score": function(newScore) {
-      if (newScore != "*") {
-        this.game.score = newScore; //user action
-        if (!this.compThink) this.$emit("game-stopped"); //otherwise wait for comp
-      }
-    }
   },
-  // Modal end of game, and then sub-components
   created: function() {
     // Computer moves web worker logic:
     this.compWorker = new Worker();
@@ -47,18 +46,18 @@ export default {
         this.$emit("game-stopped"); //no more moves: mate or stalemate
         return; //after game ends, no more moves, nothing to do
       }
-      if (!Array.isArray(compMove)) compMove = [compMove]; //to deal with MarseilleRules
+      if (!Array.isArray(compMove)) compMove = [compMove]; //potential multi-move
       // Small delay for the bot to appear "more human"
       const delay = Math.max(500 - (Date.now() - this.timeStart), 0);
       setTimeout(() => {
         if (this.currentUrl != document.location.href) return; //page change
-        // NOTE: Dark and 2-moves are incompatible
-        const animate = this.gameInfo.vname != "Dark";
+        // NOTE: do not animate move if special display (ShowMoves != "all")
+        const animate = V.ShowMoves == "all";
         const animDelay = animate ? 250 : 0;
         let moveIdx = 0;
         let self = this;
         (function executeMove() {
-          self.$set(self.game, "moveToPlay", compMove[moveIdx++]);
+          self.$refs["basegame"].play(compMove[moveIdx++], "received");
           if (moveIdx >= compMove.length) {
             self.compThink = false;
             if (self.game.score != "*")
@@ -90,6 +89,8 @@ export default {
       if (mycolor != "w" || this.gameInfo.mode == "auto")
         this.playComputerMove();
     },
+    // NOTE: a "goto" action could lead to an error when comp is thinking,
+    // but it's OK because from the user viewpoint the game just stops.
     playComputerMove: function() {
       this.timeStart = Date.now();
       this.compThink = true;
@@ -110,7 +111,7 @@ export default {
     gameOver: function(score, scoreMsg) {
       this.game.score = score;
       this.game.scoreMsg = scoreMsg;
-      this.$emit("game-over", score); //bubble up to Rules.vue
+      if (!this.compThink) this.$emit("game-stopped"); //otherwise wait for comp
     }
   }
 };