X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=74dd01d229a8ef03f90778b59e3deb5af4a40945;hb=cf742aaf8995ca8be8fc1f2751e4cf28de5d69b6;hp=67af3b9ff306d7ec4af666738b537035a97a2d7e;hpb=3d55deea9a2011c38d8d0067bd57fc889958bec2;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 67af3b9f..74dd01d2 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -61,7 +61,7 @@ export default {
         rid: ""
       },
       game: { }, //passed to BaseGame
-      oppConnected: false,
+      oppConnected: false, //TODO: use for styling
       corrMsg: "", //to send offline messages in corr games
       virtualClocks: [0, 0], //initialized with true game.clocks
       vr: null, //"variant rules" object initialized from FEN
@@ -97,7 +97,7 @@ export default {
       });
       const myTurn = (currentTurn == this.game.mycolor);
       let clockUpdate = setInterval(() => {
-        if (countdown <= 0 || this.vr.turn != currentTurn)
+        if (countdown <= 0 || this.vr.turn != currentTurn || this.game.score != "*")
         {
           clearInterval(clockUpdate);
           if (countdown <= 0 && myTurn)
@@ -152,18 +152,21 @@ export default {
         case "pong": //received if we sent a ping (game still alive on our side)
         {
           this.oppConnected = true;
-          // Send our "last state" informations to opponent(s)
-          const L = this.game.moves.length;
-          this.st.conn.send(JSON.stringify({
-            code: "lastate",
-            target: this.game.oppid,
-            gameId: this.gameRef.id,
-            lastMove: (L>0 ? this.game.moves[L-1] : undefined),
-            score: this.game.score,
-            movesCount: L,
-            drawOffer: this.drawOffer,
-            clocks: this.game.clocks,
-          }));
+          if (this.game.type == "live") //corr games are always complete
+          {
+            // Send our "last state" informations to opponent(s)
+            const L = this.game.moves.length;
+            this.st.conn.send(JSON.stringify({
+              code: "lastate",
+              target: this.game.oppid,
+              gameId: this.gameRef.id,
+              lastMove: (L>0 ? this.game.moves[L-1] : undefined),
+              score: this.game.score,
+              movesCount: L,
+              drawOffer: this.drawOffer,
+              clocks: this.game.clocks,
+            }));
+          }
           break;
         }
         case "lastate": //got opponent infos about last move
@@ -329,9 +332,10 @@ export default {
         {
           game.clocks = [tc.mainTime, tc.mainTime];
           game.initime[0] = Date.now();
-          if (myIdx >= 0) //I play in this game
+          if (myIdx >= 0 && gtype == "live")
           {
-            GameStorage.update(game.gameId,
+            // I play in this live game; corr games don't have clocks+initime
+            GameStorage.update(game.id,
             {
               clocks: game.clocks,
               initime: game.initime,
@@ -341,9 +345,17 @@ export default {
         const vModule = await import("@/variants/" + vname + ".js");
         window.V = vModule.VariantRules;
         this.vr = new V(game.fen);
+        
+
+
+//TODO: people, on connect, search for opponent.......
+console.log(myIdx + " " + game.players[1-myIdx].sid); //otherwise this is undefined:
+
+
+
         this.game = Object.assign({},
           game,
-          // NOTE: assign mycolor here, since BaseGame could also bs VS computer
+          // NOTE: assign mycolor here, since BaseGame could also be VS computer
           {
             type: gtype,
             increment: tc.increment,
@@ -430,6 +442,7 @@ export default {
     // TODO: this update function should also work for corr games
     gameOver: function(score) {
       this.game.mode = "analyze";
+      this.game.score = score;
       GameStorage.update(this.gameRef.id, { score: score });
     },
   },