Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-2/cuujooceevii61

web/game.js

@@ -99,6 +99,8 @@ function reset() {
     isDead = false;
     entered = false;
     buttonSelectDead = 0;
+    buttonSelectHome = 1;
+    buttonSelectPause = 0;
     submitted = false;
     getData()
 }
@@ -107,7 +109,6 @@ function gameOver() {
     if (lives == 0) {
         //game over screen
         iIndex = constrain(iIndex, 0, 2);
-        buttonSelectDead = constrain(buttonSelectDead, 0, 2);
         isDead = true;
         push();
         fill(255, 0, 0);
@@ -211,10 +212,12 @@ async function keyPressed() {
             if (keyCode == ENTER) {
                 homescreenOn = true;
                 reset();
+                keyReleasedFlag = false;
+                return;
             }
         }
     }
-    if (homescreenOn && keyReleasedFlag) {
+    if (homescreenOn) {
         if (keyCode == UP_ARROW) {
             buttonSelectHome -= 1;
             keyReleasedFlag = false;
@@ -225,14 +228,17 @@ async function keyPressed() {
         }
         if (buttonSelectHome == 0) {
             if (keyCode == ENTER) {
+                console.log("start game");
                 homescreenOn = false;
                 reset();
             }
         }
         if (buttonSelectHome == 1) {
             if (keyCode == ENTER) {
-                homescreenOn = false;
+                console.log("scores");
+                //homescreenOn = false;
                 reset();
+                keyReleasedFlag = false;
             }
         }
     }
@@ -285,6 +291,9 @@ function draw() {
     gameOver();
     // draw background
     background(0, 0, 0, 100);
+    buttonSelectDead = constrain(buttonSelectDead, 0, 2);
+    buttonSelectHome = constrain(buttonSelectHome, 0, 1);
+    buttonSelectPause = constrain(buttonSelectPause, 0, 1);
 
     if (homescreenOn == true) {
         homescreen();