modif fire, function selectHover and gest_event menu & game

travail_de_groupe/chef_oeuvre/src/fire.h

@@ -9,12 +9,6 @@ typedef enum
     false,true
 }booleen_t;
 
-typedef struct chain {
-    fire_t fire; 
-
-    struct chain *next;
-}chainfire_t,*listchainfire_t;
-
 typedef struct fire{
     int x;
     int y; 
@@ -22,6 +16,11 @@ typedef struct fire{
 
 }fire_t;
 
+typedef struct chain {
+    fire_t fire; 
+
+    struct chain *next;
+}chainfire_t,*listchainfire_t;
 
 listchainfire_t initFire(void);
 listchainfire_t insertAheadFire(fire_t, listchainfire_t); 

travail_de_groupe/chef_oeuvre/src/gest_event.c

@@ -7,6 +7,54 @@ int y;
 int keys[10];
 
 void manageMenu(){
+    SDL_Event event;
+    while (SDL_PollEvent(&event)){
+            switch(event.type)
+            {   
+                case SDL_QUIT:
+                    running = 0;
+                    break;
+
+                case SDL_KEYUP:
+                    switch (event.key.keysym.sym)
+                    {
+                    case SDLK_ESCAPE:
+                        running = 0;
+                        continue;
+
+                    default:
+                        continue;
+                    }
+                    break;
+                
+                case SDL_KEYDOWN:
+                    switch (event.key.keysym.sym)
+                    {
+                    case SDLK_ESCAPE:
+                        running = 0;
+                        continue;
+
+                    default:
+                        continue;
+                    }
+                    break;
+                
+                case SDL_MOUSEMOTION:
+                        x = (event.motion.x - (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2) / CELLSIZE;
+                        y = (event.motion.y - 0) / CELLSIZE;
+                        hover[0] = x;
+                        hover[1] = y;
+                    continue;
+
+                default:
+                    continue;
+            }
+    }
+    manageMovement();
+    SDL_Delay(5);
+}
+
+void manageGame(){
     SDL_Event event;
     while (SDL_PollEvent(&event)){
             switch(event.type)
@@ -86,12 +134,11 @@ void manageMenu(){
     SDL_Delay(5);
 }
 
-
 void *eventLoop(void *arg){
     while(running){
         switch(gameState){
             case MENU : manageMenu();break;
-            case GAME : manageMenu();break;
+            case GAME : manageGame();break;
             default:printf("game state fault");break;
         }
     }

travail_de_groupe/chef_oeuvre/src/player.c

@@ -24,7 +24,14 @@ void manageMovement(){
 }
 
 int selectStateHover(){
-
+    int stateHover = 0;
+    int distance = sqrt(pow(abs(hover[0]-player.x), 2)+pow(abs(hover[1]-player.y), 2));
+    printf("distance : %d\n", distance);
+    if(distance <= 2){
+        stateHover = 1;
+    }
+    return stateHover;
 }
 
-            QUiChsoiitLeBonHover(); //0 = nonHover et 1 = hover
+
+

travail_de_groupe/chef_oeuvre/src/player.h

@@ -14,5 +14,6 @@ extern player_t player;
 
 void initPlayer();
 void manageMovement();
+int selectStateHover();
 
 #endif
\ No newline at end of file