Merge branch 'main' of github.com:maberet/ProjetZZ1 into main

.gitignore

+run
+
 # Prerequisites
 *.d
 

travail_de_groupe/chef_oeuvre/markov.txt

+1 0 0 0
+0 1 0 0
+0 0 1 0
+0 0 0 1
\ No newline at end of file

travail_de_groupe/chef_oeuvre/src/fire.c

 #include "fire.h"
+#include "map.h"
+
+int markov[SIZEMARKOV][SIZEMARKOV];
 
 listchainfire_t initFire (void)
 {
@@ -108,3 +111,17 @@ listchainfire_t freeListFire (listchainfire_t listFire){
     }
     return listFire;
 }
+
+listchainfire_t offFire (listchainfire_t listFire, int x ,int y ){
+
+    if (emptyListFire(listFire)){
+        return(listFire);
+    }
+    if(((listFire->fire).x==x)&&((listFire->fire).y==y)) {
+        (listFire->fire).state=0; // feu eteint
+    }
+    else{
+        listFire->next=offFire(listFire->next,x,y);
+    }
+    return listFire; 
+}

travail_de_groupe/chef_oeuvre/src/fire.h

@@ -6,6 +6,8 @@
 #include <time.h>
 #include <stdio.h>
 
+#define SIZEMARKOV 4
+
 
 typedef struct fire{
     int x;
@@ -33,5 +35,6 @@ booleen_t searchFire(listchainfire_t, int ,int);
 listchainfire_t deleteAheadFire(listchainfire_t);
 listchainfire_t deleteFire (listchainfire_t, int ,int );
 listchainfire_t freeListFire (listchainfire_t );
+listchainfire_t offFire (listchainfire_t, int,int );
 
 #endif
\ No newline at end of file

travail_de_groupe/chef_oeuvre/src/player.c

@@ -126,9 +126,8 @@ void manageMovement(){
 
 int selectStateHover(){
     int stateHover = 0;
-    int distance = sqrt(pow(abs(mousePosition.x-player.x), 2)+pow(abs(mousePosition.y-player.y), 2));
-    printf("distance : %d\n", distance);
-    if(distance <= 2){
+    int distance = sqrt(pow(abs(mousePosition.x - ((player.x+player.w/2))/CELLSIZE), 2)+pow(abs(mousePosition.y - ((player.y+player.h/2))/CELLSIZE), 2));
+    if(distance <= 1){
         stateHover = 1;
     }
     return stateHover;

travail_de_groupe/chef_oeuvre/src/render.c

@@ -17,6 +17,9 @@ SDL_Texture * treeTexture;
 SDL_Surface * hoverSurface;
 SDL_Texture * hoverTexture;
 
+SDL_Surface * noHoverSurface;
+SDL_Texture * noHoverTexture;
+
 SDL_Surface * playerSurface;
 SDL_Texture * playerTexture;
 
@@ -109,8 +112,13 @@ void drawMap(){
                 SDL_RenderCopy(renderer, treeTexture, NULL, &rect);
             }
             if (mousePosition.x == j && mousePosition.y == i){
+                if (selectStateHover()){
                     SDL_RenderCopy(renderer, hoverTexture, NULL, &rect);
                 }
+                else {
+                    SDL_RenderCopy(renderer, noHoverTexture, NULL, &rect);
+                }
+            }
             rect.x += CELLSIZE;
         }
         rect.x = (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2;
@@ -154,6 +162,9 @@ void mainLoop(){
     hoverSurface = IMG_Load("Res/hover.png");
     hoverTexture = SDL_CreateTextureFromSurface(renderer, hoverSurface);
 
+    noHoverSurface = IMG_Load("Res/noHover.png");
+    noHoverTexture = SDL_CreateTextureFromSurface(renderer, noHoverSurface);
+
     playerSurface = IMG_Load("Res/character_spritesheet.png");
     playerTexture = SDL_CreateTextureFromSurface(renderer, playerSurface);
 
@@ -177,6 +188,7 @@ void mainLoop(){
     SDL_FreeSurface(playButtonSurface);
     SDL_FreeSurface(playButtonHoverSurface);
     SDL_FreeSurface(backgroundSidesSurface);
+    SDL_FreeSurface(noHoverSurface);
 
     unsigned int a = SDL_GetTicks();
     unsigned int b = SDL_GetTicks();