X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=202f542a530b56e359b0cf932198ae36367b9f4d;hb=c364df7516985616b09ee9ec3c4671ed6fd3ef8b;hp=cb4d273d72f7a3ba086b06050e8a74679973d5a6;hpb=8b7aead3839ef4d5648aa7244412803753fee969;p=vchess.git

diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index cb4d273d..202f542a 100644
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -25,7 +25,7 @@ Vue.component('my-game', {
 	},
 	render(h) {
 		const [sizeX,sizeY] = VariantRules.size;
-		const smallScreen = (screen.width <= 420);
+		const smallScreen = (window.innerWidth <= 420);
 		// Precompute hints squares to facilitate rendering
 		let hintSquares = doubleArray(sizeX, sizeY, false);
 		this.possibleMoves.forEach(m => { hintSquares[m.end.x][m.end.y] = true; });
@@ -660,6 +660,7 @@ Vue.component('my-game', {
 														"value": "0",
 														innerHTML: "None"
 													},
+													attrs: { "selected": this.sound==0 },
 												}
 											),
 											h("option",
@@ -668,6 +669,7 @@ Vue.component('my-game', {
 														"value": "1",
 														innerHTML: "Newgame"
 													},
+													attrs: { "selected": this.sound==1 },
 												}
 											),
 											h("option",
@@ -676,6 +678,7 @@ Vue.component('my-game', {
 														"value": "2",
 														innerHTML: "All"
 													},
+													attrs: { "selected": this.sound==2 },
 												}
 											),
 										],
@@ -776,7 +779,7 @@ Vue.component('my-game', {
 	created: function() {
 		const url = socketUrl;
 		const continuation = (localStorage.getItem("variant") === variant);
-		this.myid = continuation ? localStorage.getItem("myid") : getRandString();
+		this.myid = (continuation ? localStorage.getItem("myid") : getRandString());
 		if (!continuation)
 		{
 			// HACK: play a small silent sound to allow "new game" sound later
@@ -805,6 +808,12 @@ Vue.component('my-game', {
 			const data = JSON.parse(msg.data);
 			switch (data.code)
 			{
+				case "duplicate":
+					// We opened another tab on the same game
+					this.mode = "idle";
+					this.vr = null;
+					alert("Already playing a game in this variant on another tab!");
+					break;
 				case "newgame": //opponent found
 					// oppid: opponent socket ID
 					this.newGame("human", data.fen, data.color, data.oppid);
@@ -1005,7 +1014,7 @@ Vue.component('my-game', {
 			this.endGame(this.mycolor=="w"?"0-1":"1-0");
 		},
 		newGame: function(mode, fenInit, color, oppId, moves, continuation) {
-			const fen = fenInit || VariantRules.GenRandInitFen();
+			const fen = "3N1K2/2n2q2/P1R1kPnN/p3b1p1/b7/5Q2/4r3/8 0000";//fenInit || VariantRules.GenRandInitFen();
 			console.log(fen); //DEBUG
 			if (mode=="human" && !oppId)
 			{
@@ -1048,7 +1057,7 @@ Vue.component('my-game', {
 					document.getElementById("modal-newgame").checked = false;
 				}
 				this.oppid = oppId;
-				this.oppConnected = true;
+				this.oppConnected = !continuation;
 				this.mycolor = color;
 				this.seek = false;
 				if (!!moves && moves.length > 0) //imply continuation
@@ -1063,7 +1072,7 @@ Vue.component('my-game', {
 			}
 			else if (mode == "computer")
 			{
-				this.mycolor = Math.random() < 0.5 ? 'w' : 'b';
+				this.mycolor = "w";//Math.random() < 0.5 ? 'w' : 'b';
 				if (this.mycolor == 'b')
 					setTimeout(this.playComputerMove, 500);
 			}