diff --git a/client/src/main.js b/client/src/main.js index 48b7ddc033836f6c5f4c498e94a392873d26b30e..924b05b61a6b399ae97c17e51320ab15010f1b02 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -42,8 +42,7 @@ document .addEventListener('click', affichage.afficherCredits); function startGame(event) { - gameStarted = true; - const canvasSize = affichage.startGame(event, socket, canvas); + const canvasSize = affichage.startGame(event, canvas); socket.emit('canvasSize', canvasSize); } diff --git a/client/src/render.js b/client/src/render.js index 6364ba3a242567453e80ae2f8cc9ed5b1869c943..96812c82ab2a595aae260d785cf37456d9cc217c 100644 --- a/client/src/render.js +++ b/client/src/render.js @@ -40,7 +40,7 @@ export default class Render { } else if (enemi.difficulté == 2) { draw(canvas, context, this.imageEnemi2, x, y); } else if (enemi.difficulté == 3) { - draw(canvas, context, imageEnemi3, x, y); + draw(canvas, context, this.imageEnemi3, x, y); } } diff --git a/server/index.js b/server/index.js index 20ba3aff9c3396f330f968eeff6df7c6cbf5c304..ced0463d6e6e5f781cedb6ca4eda78bcb5b12dd7 100644 --- a/server/index.js +++ b/server/index.js @@ -126,10 +126,7 @@ let spawnIntervalLV1 = setInterval(() => { let spawnIntervalLV2 = setInterval(() => { if (LVL2start && gameStarted) { - let randomY = Math.random() * (canvasSize.height - 0) + 0; - do { - randomY = Math.random() * (canvasSize.height - 0) + 0; - } while (randomY > canvasSize.height - 100); + let randomY = Math.random() * (canvasSize.height - 100); const newEnemy = new enemi(canvasSize.width - 100, randomY, 1, 2); enemis.push(newEnemy); } @@ -137,10 +134,7 @@ let spawnIntervalLV2 = setInterval(() => { let spawnIntervalLV3 = setInterval(() => { if (LVL3start && gameStarted) { - let randomY = Math.random() * (canvasSize.height - 0) + 0; - do { - randomY = Math.random() * (canvasSize.height - 0) + 0; - } while (randomY > canvasSize.height - 100); + let randomY = Math.random() * (canvasSize.height - 100); const newEnemy = new enemi(canvasSize.width - 100, randomY, 1, 3); enemis.push(newEnemy); }