X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fshared%2FchallengeCheck.js;h=85d8571d1bee65d6e71b9df28c18d392405ad643;hb=b955c65b942d09d24b5c3bed0d755d4f2f8f71f1;hp=a5833f6217e0727d679ecd658045de54ed33c367;hpb=ab4f4bf258ed68d8292b64d81babde03cddbae3c;p=vchess.git

diff --git a/public/javascripts/shared/challengeCheck.js b/public/javascripts/shared/challengeCheck.js
index a5833f62..85d8571d 100644
--- a/public/javascripts/shared/challengeCheck.js
+++ b/public/javascripts/shared/challengeCheck.js
@@ -1,4 +1,5 @@
-function checkChallenge(c)
+// 'vname' for 'variant name' is defined when run on client side
+function checkChallenge(c, vname)
 {
 	const vid = parseInt(c.vid);
 	if (isNaN(vid) || vid <= 0)
@@ -15,44 +16,30 @@ function checkChallenge(c)
 	let playerCount = 0;
 	for (p of c.players)
 	{
-		if (p.length > 0)
+		if (p.name.length > 0)
 		{
-			if (!p.match(/^[\w]+$/))
+			if (!p.name.match(/^[\w]+$/))
 				return "Wrong characters in players names";
 			playerCount++;
 		}
 	}
 
-	if (playerCount > 0 && playerCount != c.nbPlayers)
+	if (playerCount > 0 && playerCount != c.nbPlayers-1)
 		return "None, or all of the opponent names must be filled"
 
-	if (!!document) //client side
+	if (typeof document !== "undefined") //client side
 	{
-		const idxInVariants = variantArray.findIndex(v => v.id == c.vid);
-		const vname = variantArray[idxInVariants].name;
-		const scriptId = vname + "RulesScript";
-		const afterRulesAreLoaded = () => {
-			const V = eval(vname + "Rules");
-			// Allow custom FEN (and check it) only for individual challenges
-			if (c.fen.length > 0 && playerCount > 0)
-			{
-				if (!V.IsGoodFen(c.fen))
-					return "Bad FEN string";
-			}
-			else
-			{
-				// Generate a FEN
-				c.fen = V.GenRandInitFen();
-			}
-		};
-		if (!document.getElementById(scriptId))
+		const V = eval(vname + "Rules");
+		// Allow custom FEN (and check it) only for individual challenges
+		if (c.fen.length > 0 && playerCount > 0)
 		{
-			// Load variant rules (only once)
-			var script = document.createElement("script");
-			script.id = scriptId;
-			script.src = "/javascripts/variants/" + vname + ".js";
-			document.body.appendChild(script);
-			script.onload = afterRulesAreLoaded;
+			if (!V.IsGoodFen(c.fen))
+				return "Bad FEN string";
+		}
+		else
+		{
+			// Generate a FEN
+			c.fen = V.GenRandInitFen();
 		}
 	}
 	else