From 89e7e2e87bf5615081c458a1682467c383446182 Mon Sep 17 00:00:00 2001
From: Mathis Decoster <mathis.decoster.etu@univ-lille.fr>
Date: Fri, 5 Apr 2024 14:04:33 +0200
Subject: [PATCH] correctif + refacto

---
 client/src/main.js   |  3 +--
 client/src/render.js |  2 +-
 server/index.js      | 10 ++--------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/client/src/main.js b/client/src/main.js
index 48b7ddc..924b05b 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 6364ba3..96812c8 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 20ba3af..ced0463 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);
 	}
-- 
GitLab