Merge branch 'main' into render

travail_de_groupe/jeu_appren_par_renfo/src/ennemy.c

@@ -6,6 +6,8 @@ int ennemyZone;
 int canonZone;
 int action;
 
+int ennemyHasMoved = 0;
+
 void initEnnemy()
 {
     ennemy.h = 2 * BLOCK_SIZE;
@@ -18,7 +20,8 @@ void initEnnemy()
 
 void manageEnnemyMovement()
 {
-    if (ball.isTravelingTo == AI){
+    if (ball.isTravelingTo == AI)
+    {
         angleF = defineAngleF(lastHitPoint[0], lastHitPoint[1], landingPoint[0], landingPoint[1]);
         angleF = converterIntoAngleF(angleF);
         angleH = defineAngleH(lastHitPoint[0], landingPoint[0]);
@@ -26,27 +29,64 @@ void manageEnnemyMovement()
         ennemyZone = convertIntoZone(ennemy.x, ennemy.y);
         canonZone = convertIntoZone(lastHitPoint[0], lastHitPoint[1]);
         action = takeAction(ennemy.x, ennemy.y, Q, canonZone, angleH, angleF, 1);
-        switch (action)
+        while (ennemyHasMoved == 0)
         {
+            switch (action)
+            {
             case BACK:
-                ennemy.x += BLOCK_SIZE;
+                if (ennemy.x + BLOCK_SIZE < (MAP_WIDTH-1) * BLOCK_SIZE)
+                {
+                    ennemy.x += BLOCK_SIZE;
+                    ennemyHasMoved = 1;
+                }
+                else
+                {
+                    action = takeAction(ennemy.x, ennemy.y, Q, canonZone, angleH, angleF, 1);
+                }
                 break;
 
             case FOWARD:
-                ennemy.x -= BLOCK_SIZE;
+                if (ennemy.x - BLOCK_SIZE > (MAP_WIDTH/2 + 1) * BLOCK_SIZE)
+                {
+                    ennemy.x -= BLOCK_SIZE;
+                    ennemyHasMoved = 1;
+                }
+                else
+                {
+                    action = takeAction(ennemy.x, ennemy.y, Q, canonZone, angleH, angleF, 1);
+                }
                 break;
 
             case UP:
-                ennemy.y -= BLOCK_SIZE;
+                if (ennemy.y - BLOCK_SIZE > 1)
+                {
+                    ennemy.y -= BLOCK_SIZE;
+                    ennemyHasMoved = 1;
+                }
+                else
+                {
+                    action = takeAction(ennemy.x, ennemy.y, Q, canonZone, angleH, angleF, 1);
+                }
                 break;
 
             case DOWN:
-                ennemy.y += BLOCK_SIZE;
+                if (ennemy.y + BLOCK_SIZE < (MAP_HEIGHT-1) * BLOCK_SIZE)
+                {
+                    ennemy.y += BLOCK_SIZE;
+                    ennemyHasMoved = 1;
+                }
+                else
+                {
+                    action = takeAction(ennemy.x, ennemy.y, Q, canonZone, angleH, angleF, 1);
+                }
                 break;
-            
+
             default:
+                ennemyHasMoved = 1;
                 break;
+            }
         }
+        ennemyHasMoved = 0;
     }
 }
 

travail_de_groupe/jeu_appren_par_renfo/src/player.c

@@ -84,7 +84,6 @@ void hitBall()
                 if(landingPointIsFind == 0){
                     freeIntList(landingPoint);
                     landingPoint = generateLandingPoint(rxWall);
-                    printf("landing point: x=%d; y=%d\n", landingPoint[0], landingPoint[1]);
                 }
 
                 lastHitPoint[0] = ball.x;

travail_de_groupe/jeu_appren_par_renfo/src/render.c

@@ -760,7 +760,6 @@ void drawEnnemy()
     }
 }
 
-
 int isAngleInRange(float angle, float min, float max)
 {
     return ((angle >= min && angle <= max)) || ((angle >= max && angle <= min));
@@ -884,22 +883,23 @@ void drawMap2D(int map[][MAP_WIDTH])
 
     // draw player
     SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255);
-    rect.x = (player.x * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE/2;
-    rect.y = (player.y * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE/2;
+    rect.x = (player.x * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE / 2;
+    rect.y = (player.y * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE / 2;
     SDL_RenderFillRect(renderer, &rect);
 
     // draw ennemi
     SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255);
-    rect.x = (ennemy.x * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE/2;
-    rect.y = (ennemy.y * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE/2;
+    rect.x = (ennemy.x * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE / 2;
+    rect.y = (ennemy.y * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE / 2;
     SDL_RenderFillRect(renderer, &rect);
 
-    //draw landing point
-    if(landingPointIsFind == 1){
+    // draw landing point
+    if (landingPointIsFind == 1)
+    {
         SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255);
         rect.x = landingPoint[0] * CELL_SIZE;
         rect.y = CELL_SIZE;
-        rect.h = (MAP_HEIGHT-2) * CELL_SIZE;
+        rect.h = (MAP_HEIGHT - 2) * CELL_SIZE;
         rect.w = 3;
         SDL_RenderFillRect(renderer, &rect);
         // reset taille cellule
@@ -909,8 +909,8 @@ void drawMap2D(int map[][MAP_WIDTH])
 
     // draw ball
     SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255);
-    rect.x = (ball.x * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE/2;
-    rect.y = (ball.y * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE/2;
+    rect.x = (ball.x * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE / 2;
+    rect.y = (ball.y * CELL_SIZE) / BLOCK_SIZE - CELL_SIZE / 2;
     SDL_RenderFillRect(renderer, &rect);
 
     SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);