From 29ed7dc6dfc5de330a62c22a4d1be6db3ae7a686 Mon Sep 17 00:00:00 2001
From: boutarci <jude-christ.aissi@etu.u-pec.fr>
Date: Fri, 22 Dec 2023 15:11:29 +0100
Subject: [PATCH] =?UTF-8?q?R=C3=A9glage=20time,=20r=C3=A9glage=20usleep,?=
 =?UTF-8?q?=20r=C3=A9glage=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SAE_semestre1/Makefile                    |  40 ++--
 SAE_semestre1/{ => fichier.h}/Oeuf.h      |   2 +-
 SAE_semestre1/{ => fichier.h}/fonctions.h |   0
 SAE_semestre1/{ => fichier.h}/main.h      |   2 +
 SAE_semestre1/{ => fichier.h}/menu.h      |   0
 SAE_semestre1/{ => fichier.h}/serpent.h   |   0
 SAE_semestre1/fichier.h/terrain.h         |   6 +
 SAE_semestre1/{ => fichier.h}/time.h      |   0
 SAE_semestre1/game.c                      | 234 ----------------------
 SAE_semestre1/img/queue.png               | Bin 0 -> 4714 bytes
 SAE_semestre1/snake                       | Bin 0 -> 21216 bytes
 SAE_semestre1/{ => src}/Oeuf.c            |  12 +-
 SAE_semestre1/{ => src}/main.c            |  26 ++-
 SAE_semestre1/{ => src}/menu.c            |  21 +-
 SAE_semestre1/{ => src}/serpent.c         |  41 ++--
 SAE_semestre1/{ => src}/terrain.c         |  16 +-
 SAE_semestre1/{ => src}/time.c            |   9 +-
 SAE_semestre1/terrain.h                   |   6 -
 18 files changed, 99 insertions(+), 316 deletions(-)
 rename SAE_semestre1/{ => fichier.h}/Oeuf.h (64%)
 rename SAE_semestre1/{ => fichier.h}/fonctions.h (100%)
 rename SAE_semestre1/{ => fichier.h}/main.h (70%)
 rename SAE_semestre1/{ => fichier.h}/menu.h (100%)
 rename SAE_semestre1/{ => fichier.h}/serpent.h (100%)
 create mode 100755 SAE_semestre1/fichier.h/terrain.h
 rename SAE_semestre1/{ => fichier.h}/time.h (100%)
 delete mode 100755 SAE_semestre1/game.c
 create mode 100644 SAE_semestre1/img/queue.png
 create mode 100755 SAE_semestre1/snake
 rename SAE_semestre1/{ => src}/Oeuf.c (62%)
 rename SAE_semestre1/{ => src}/main.c (81%)
 rename SAE_semestre1/{ => src}/menu.c (71%)
 rename SAE_semestre1/{ => src}/serpent.c (68%)
 rename SAE_semestre1/{ => src}/terrain.c (54%)
 rename SAE_semestre1/{ => src}/time.c (90%)
 delete mode 100755 SAE_semestre1/terrain.h

diff --git a/SAE_semestre1/Makefile b/SAE_semestre1/Makefile
index 09b5ca8..b6b8bb2 100755
--- a/SAE_semestre1/Makefile
+++ b/SAE_semestre1/Makefile
@@ -1,29 +1,31 @@
-
 CC = gcc
 CFLAGS = -ansi -pedantic -lgraph 
-OBJS = main.o serpent.o time.o terrain.o Oeuf.o
+SRCDIR = ./src
+HDIR = ./fichier.h
+ODIR = ./out
+OFILES = $(subst $(SRCDIR)/,$(ODIR)/,$(subst .c,.o,$(shell find $(SRCDIR)/ -type f)))
+EXE = snake
 
+.PHONY: all clean run
 
-snake: $(OBJS)
-	$(CC)  -o snake $(OBJS) $(CFLAGS)
+all: $(EXE)
 
-main.o:  serpent.h time.h Oeuf.h main.h menu.h
-	$(CC) -c main.c $(CFLAGS)
+$(ODIR)/%.o : $(SRCDIR)/%.c 
+	@mkdir -p $(@D)
+	$(CC) -c $< -o $@
 
-serpent.o: serpent.h
-	$(CC) -c serpent.c $(CFLAGS)
+$(EXE) : $(OFILES)
+	$(CC) $(CFLAGS) -o $(EXE) $(OFILES)
 
-menu.o: main.h time.h
-	$(CC) -c menu.c $(CFLAGS)
+run : $(EXE)
+	./$(EXE)
 
-time.o:  time.h serpent.h main.h
-	$(CC) -c time.c $(CFLAGS)
+clean : 
+	-rm -rf $(ODIR)
 
-Oeuf.o:  Oeuf.h time.h 
-	$(CC) -c Oeuf.c $(CFLAGS)
+# Nouvelle règle pour la dépendance implicite
+$(EXE): $(ODIR)/a.out
 
-terrain.o:  terrain.h serpent.h time.h main.h Oeuf.h
-	$(CC) -c terrain.c $(CFLAGS)
-
-clean:
-	rm -f *.o snake
\ No newline at end of file
+# Nouvelle règle pour construire 'out/a.out'
+$(ODIR)/a.out: $(OFILES)
+	$(CC) $(CFLAGS) -o $@ $(OFILES)
\ No newline at end of file
diff --git a/SAE_semestre1/Oeuf.h b/SAE_semestre1/fichier.h/Oeuf.h
similarity index 64%
rename from SAE_semestre1/Oeuf.h
rename to SAE_semestre1/fichier.h/Oeuf.h
index a998f00..5c28429 100755
--- a/SAE_semestre1/Oeuf.h
+++ b/SAE_semestre1/fichier.h/Oeuf.h
@@ -2,6 +2,6 @@
 #define OEUF_H
 
 void InitialiserOeufs(int oeufx[], int oeufy[], int segment);
-void Oeuf(int pos_x[], int pos_y[], int oeufx[], int oeufy[], int *segment);
+void Oeuf(int old_x[], int old_y[], int oeufx[], int oeufy[], int *segment);
 
 #endif 
diff --git a/SAE_semestre1/fonctions.h b/SAE_semestre1/fichier.h/fonctions.h
similarity index 100%
rename from SAE_semestre1/fonctions.h
rename to SAE_semestre1/fichier.h/fonctions.h
diff --git a/SAE_semestre1/main.h b/SAE_semestre1/fichier.h/main.h
similarity index 70%
rename from SAE_semestre1/main.h
rename to SAE_semestre1/fichier.h/main.h
index bd08be7..a73dc70 100755
--- a/SAE_semestre1/main.h
+++ b/SAE_semestre1/fichier.h/main.h
@@ -1,6 +1,8 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+
+void attente(int milliseconds);
 int lancer_jeu(void);
 int main(void);
  
diff --git a/SAE_semestre1/menu.h b/SAE_semestre1/fichier.h/menu.h
similarity index 100%
rename from SAE_semestre1/menu.h
rename to SAE_semestre1/fichier.h/menu.h
diff --git a/SAE_semestre1/serpent.h b/SAE_semestre1/fichier.h/serpent.h
similarity index 100%
rename from SAE_semestre1/serpent.h
rename to SAE_semestre1/fichier.h/serpent.h
diff --git a/SAE_semestre1/fichier.h/terrain.h b/SAE_semestre1/fichier.h/terrain.h
new file mode 100755
index 0000000..72b9aca
--- /dev/null
+++ b/SAE_semestre1/fichier.h/terrain.h
@@ -0,0 +1,6 @@
+#ifndef TERRAIN_H
+#define TERRAIN_H
+
+void Scene(int murx[], int mury[], int minute, int seconde, char timer []);
+
+#endif 
diff --git a/SAE_semestre1/time.h b/SAE_semestre1/fichier.h/time.h
similarity index 100%
rename from SAE_semestre1/time.h
rename to SAE_semestre1/fichier.h/time.h
diff --git a/SAE_semestre1/game.c b/SAE_semestre1/game.c
deleted file mode 100755
index b5d4e56..0000000
--- a/SAE_semestre1/game.c
+++ /dev/null
@@ -1,234 +0,0 @@
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <graph.h>
-#include <time.h>
-#define CYCLE 100000L
-
-void DessinerScene(int murx[], int mury[], int minute, int seconde, char timer []){
-    int mur;
-    int i;
-    snprintf(timer,6,"%02d:%02d", minute ,seconde);
-    ChoisirCouleurDessin(CouleurParComposante(218,209,77));
-    RemplirRectangle(20,20,1160,700);
-    ChoisirCouleurDessin(CouleurParComposante(255,255,255)); 
-    srand(time(NULL));
-    for(i=0; i<30; i++){
-        murx[i] = ((rand() % (55)+1)*20);
-        mury[i] = ((rand() % (35)+1)*20);
-         ChargerImage("../img/cactus.png", murx[i], mury[i],0,0, 20,20);
-    }
-}
-void Score(int segment){
-    int nombre;
-    char score[4];
-    nombre= (segment-10)*25;
-    snprintf(score,4,"%04d0", nombre);
-    ChoisirCouleurDessin(CouleurParNom("black"));
-    RemplirRectangle(1100,700,1200,800);
-    ChoisirCouleurDessin(CouleurParNom("white"));
-    EcrireTexte(1000,760,"Score: ",2);
-    EcrireTexte(1100,760,score,2);
-}
-void Update_Timer(int minute, int seconde, char timer[]){
-    snprintf(timer,6,"%02d:%02d", minute, seconde);
-    ChoisirCouleurDessin(CouleurParComposante(0,0,0));
-    RemplirRectangle(10,700,12000,800);
-    ChoisirCouleurDessin(CouleurParComposante(255,255,255));
-    EcrireTexte(50,760,"time: ",2);
-    EcrireTexte(120,760,timer,2);
-}
-void Update_Serpent(int pos_x[], int pos_y[], int segment, int old_x[], int old_y[], int* direction){
-    int i = 0;
-    for (i=1 ; i<segment ; i++){
-        pos_x[i]=old_x[i-1];
-        pos_y[i]=old_y[i-1];
-    }
-    
-    if (*direction == 1){
-        pos_y[0]=old_y[0]-20;
-    }
-    if (*direction == 2) {
-        pos_y[0]=old_y[0]+20;
-    }
-    if (*direction == 3) {
-        pos_x[0]=old_x[0]-20;
-    }
-    if (*direction == 4) {
-        pos_x[0]=old_x[0]+20;
-   }
-    for (i=0 ; i<segment ; i++){
-        ChargerImage("../img/serpent2.png", pos_x[i], pos_y[i],0,0, 20,20);
-    }
-    for (i=0 ; i<segment ; i++){
-        ChoisirCouleurDessin(CouleurParComposante(218,209,77));
-        RemplirRectangle(pos_x[segment-1], pos_y[segment-1], 20,20);
-
-        old_x[i]=pos_x[i];
-        old_y[i]=pos_y[i];
-    } 
-
-
-}
-void Collision_Serpent(int pos_x[], int pos_y[], int segment, int murx[], int mury[], int *go_on){
-    int i;
-    /*Serpent contre coté*/
-    if (pos_x[0] >1160 || pos_x[0]<=0){
-            *go_on=0;
-    }
-    /*Serpent contre coté*/
-    if (pos_y[0]<20 || pos_y[0] >=700){
-        *go_on=0;
-    }
-    /*Serpent contre Serpent*/
-    for (i = 1; i < segment; i++) {
-        if (pos_x[0] == pos_x[i] && pos_y[0] == pos_y[i]){
-            *go_on = 0;
-        }
-    }
-    /*Serpent contre mur*/
-    for(i=0; i<30;i++){
-        if(pos_x[0] == murx[i] && pos_y[0] == mury[i]){
-            *go_on=0;
-        }
-    }
-}
-void Timer(int *minute, int *seconde, unsigned long int *suivant, int *seconde_actuel, int *old_seconde, char timer[]){
-    if(Microsecondes()> *suivant){
-        *suivant = Microsecondes()+CYCLE;
-        *seconde_actuel = (*suivant/1000000)%10;
-        if(seconde_actuel !=old_seconde){
-            *old_seconde = *seconde_actuel;
-            if(*seconde == 59){
-                *minute=*minute+1;
-                *seconde=0;
-                Update_Timer(*minute, *seconde, timer);
-            }else{
-                *seconde = *seconde+1;
-                Update_Timer(*minute, *seconde, timer);
-            }
-        }
-    }
-}
-void Controle(int *direction, int last_direction, int *go_on) {
-    int t;
-    while(ToucheEnAttente()) {
-        t = Touche();
-        switch(t) {
-            case XK_Left:
-                if (last_direction != 4) {
-                    *direction = 3;
-                }
-                return;
-            case XK_Right:
-                if (last_direction != 3) {
-                    *direction = 4;
-                }
-                return;
-            case XK_Up:
-                if (last_direction != 2) {
-                    *direction = 1;
-                }
-                return;
-            case XK_Down:
-                if (last_direction != 1) {
-                    *direction = 2;
-                }
-                return;
-            case XK_Escape:
-                *direction = 0;
-                *go_on = 0;
-                return;
-            case XK_p:
-                *direction = 0;
-        }
-    }
-}
-void Serpent(int pos_x[], int pos_y[], int old_x[], int old_y[], int *segment, int murx[], int mury[], int *go_on, int *direction) {
-    int serpent;
-     int i = 0;
-    pos_x[0] = 600;
-    pos_y[0] = 400;
-    for (i = 0; i < *segment; i++){
-      pos_x[i]= pos_x[0];
-      pos_y[i]= pos_y[0];
-      old_x[i]=pos_x[i];
-      old_y[i]=pos_y[i];
-    }
-}
-void InitialiserOeufs(int oeufx[], int oeufy[], int segment) {
-    int p;
-    int oeuf;
-    for (p = 0; p < 5; p++) {
-        oeufx[p] = ((rand() % (55) + 1) * 20);
-        oeuf[p] = ((rand() % (35) + 1) * 20);
-        ChargerImage("../img/oeuf.png", oeufx[p], oeufy[p],0,0, 20,20);
-    }
-}
-void Oeuf(int pos_x[], int pos_y[], int oeufx[], int oeufy[], int *segment){
-    int p;
-    int oeuf;  
-    for (p = 0; p < 5; p++) {
-        ChargerImage("../img/oeuf.png", oeufx[p], oeufy[p],0,0, 20,20);
-    }
-    for(p=0; p<5; p++){
-        if(oeufx[p]==pos_x[0] && oeufy[p]==pos_y[0]){
-            (*segment) +=2;
-            oeufx[p] = ((rand() % (55)+1)*20);
-            oeufy[p] = ((rand() % (35)+1)*20);
-        }
-    }
-}
-/*void Menu_debut(){
-    affiche = ChargerSprite("Img/image.png");
-    AfficherSprite(affiche,0,0);
-}
-Menu_debut();*/
-
-
-int main(void){
-    int segment = 10;
-    int go_on = 1;
-    int direction = 4;
-    int minute = 0;
-    int seconde = 0;
-    int seconde_actuel = 0;
-    int old_seconde = 0;
-    unsigned long int suivant;
-    int pos_x[2400];
-    int pos_y[2400];
-    int old_x[2400];
-    int old_y[2400];
-    int oeufx[5];
-    int oeufy[5];
-    int murx[30];
-    int mury[30];
-    char timer[6];
-    int *pointeur_segment = &segment;
-    int *pointeur_go_on = &go_on;
-    int *pointeur_direction = &direction;
-    int *pointeur_minute = &minute;
-    int *pointeur_seconde = &seconde;
-    unsigned long int *pointeur_suivant = &suivant;
-    int *pointeur_seconde_actuel = &seconde_actuel;
-    int *pointeur_old_seconde = &old_seconde;
-    InitialiserGraphique();
-    CreerFenetre(350,100,1200,900);
-    EffacerEcran(CouleurParComposante(0,0,0));
-    suivant = Microsecondes()+CYCLE;
-    old_seconde=(suivant/1000000)%10;
-    DessinerScene(murx, mury, minute, seconde ,timer);
-    InitialiserOeufs(oeufx, oeufy, segment);
-    Serpent(pos_x, pos_y, old_x, old_y, pointeur_segment, murx, mury, pointeur_go_on, pointeur_direction);
-    while(go_on){
-        Timer( pointeur_minute, pointeur_seconde,  pointeur_suivant, pointeur_seconde_actuel, pointeur_old_seconde, timer);
-        Score(segment);
-        Controle(pointeur_direction, 0, pointeur_go_on);
-        Update_Serpent(pos_x, pos_y, segment, old_x, old_y, pointeur_direction);
-        Collision_Serpent(pos_x, pos_y, segment, murx, mury, pointeur_go_on);
-        usleep(100000);
-        Oeuf(pos_x, pos_y, oeufx, oeufy, pointeur_segment);
-    }
-    FermerGraphique();
-    return EXIT_SUCCESS;
-}
diff --git a/SAE_semestre1/img/queue.png b/SAE_semestre1/img/queue.png
new file mode 100644
index 0000000000000000000000000000000000000000..2190f78834ca0fc673715274e066ee912cff9885
GIT binary patch
literal 4714
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
L3XiY9Z^yp@!b~Yg

literal 0
HcmV?d00001

diff --git a/SAE_semestre1/snake b/SAE_semestre1/snake
new file mode 100755
index 0000000000000000000000000000000000000000..45f2df3eb99dc129b038b350b432bb7df4e350d0
GIT binary patch
literal 21216
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
Ys&bX=NMtM`oK<<9kT~C>U_se`0yYJyXaE2J

literal 0
HcmV?d00001

diff --git a/SAE_semestre1/Oeuf.c b/SAE_semestre1/src/Oeuf.c
similarity index 62%
rename from SAE_semestre1/Oeuf.c
rename to SAE_semestre1/src/Oeuf.c
index 5709d73..f1f2db7 100755
--- a/SAE_semestre1/Oeuf.c
+++ b/SAE_semestre1/src/Oeuf.c
@@ -1,7 +1,7 @@
 #include <graph.h>
 #include <stdlib.h>
-#include "Oeuf.h"
-#include "time.h"
+#include "../fichier.h/Oeuf.h"
+#include "../fichier.h/time.h"
 
 void InitialiserOeufs(int oeufx[], int oeufy[], int segment) {
     int p;
@@ -9,17 +9,17 @@ void InitialiserOeufs(int oeufx[], int oeufy[], int segment) {
     for (p = 0; p < 5; p++) {
         oeufx[p] = ((rand() % (55) + 1) * 20);
         oeufy[p] = ((rand() % (35) + 1) * 20);
-        ChargerImage("../img/oeuf.png", oeufx[p], oeufy[p],0,0, 20,20);
+        ChargerImage("img/oeuf.png", oeufx[p], oeufy[p],0,0, 20,20);
     }
 }
-void Oeuf(int pos_x[], int pos_y[], int oeufx[], int oeufy[], int *segment){
+void Oeuf(int old_x[], int old_y[], int oeufx[], int oeufy[], int *segment){
     int p;
     int oeuf;  
     for (p = 0; p < 5; p++) {
-        ChargerImage("../img/oeuf.png", oeufx[p], oeufy[p],0,0, 20,20);
+        ChargerImage("img/oeuf.png", oeufx[p], oeufy[p],0,0, 20,20);
     }
     for(p=0; p<5; p++){
-        if(oeufx[p]==pos_x[0] && oeufy[p]==pos_y[0]){
+        if(oeufx[p]==old_x[0] && oeufy[p]==old_y[0]){
             (*segment) +=2;
             oeufx[p] = ((rand() % (55)+1)*20);
             oeufy[p] = ((rand() % (35)+1)*20);
diff --git a/SAE_semestre1/main.c b/SAE_semestre1/src/main.c
similarity index 81%
rename from SAE_semestre1/main.c
rename to SAE_semestre1/src/main.c
index c45fc7b..81fb7ca 100644
--- a/SAE_semestre1/main.c
+++ b/SAE_semestre1/src/main.c
@@ -1,12 +1,21 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <graph.h>
-#include "serpent.h"
-#include "Oeuf.h"
-#include "time.h"
-#include "main.h"
-#include "menu.h"
+#include <time.h>
+#include "../fichier.h/serpent.h"
+#include "../fichier.h/Oeuf.h"
+#include "../fichier.h/time.h"
+#include "../fichier.h/main.h"
+#include "../fichier.h/menu.h"
+
 #define CYCLE 100000L
+#define DELAI_MILLISECONDES 100
+
+void attente(int milliseconds) {
+    clock_t start_time = clock();
+    while ((clock() - start_time) * 1000 / CLOCKS_PER_SEC < milliseconds) {
+    }
+}
 
 int lancer_jeu(){
     int go_on=1;
@@ -37,7 +46,7 @@ int lancer_jeu(){
     int *pointeur_pause = &pause;
     suivant = Microsecondes()+CYCLE;
     old_seconde=(suivant/1000000)%10;
-    DessinerScene(murx, mury, minute, seconde ,timer);
+    Scene(murx, mury, minute, seconde ,timer);
     InitialiserOeufs(oeufx, oeufy, segment);
     Serpent(pos_x, pos_y, old_x, old_y, pointeur_segment, murx, mury, &go_on, pointeur_direction);
     bordure(segment);
@@ -49,7 +58,7 @@ int lancer_jeu(){
         Update_Serpent(pos_x, pos_y, segment, old_x, old_y, pointeur_direction);
         dessinerSerpent(pos_x, pos_y, segment, old_x, old_y);
         Collision_Serpent(pos_x, pos_y, segment, murx, mury, &go_on);
-        usleep(90000);
+        attente(DELAI_MILLISECONDES);
         Oeuf(pos_x, pos_y, oeufx, oeufy, pointeur_segment);
     }
     }
@@ -63,9 +72,6 @@ int main(void){
     if(Menu() == 1){
      lancer_jeu();
     }
-    if(Menu() == 0){
-        Menu();
-    }
     FermerGraphique();
     return EXIT_SUCCESS;
 }
diff --git a/SAE_semestre1/menu.c b/SAE_semestre1/src/menu.c
similarity index 71%
rename from SAE_semestre1/menu.c
rename to SAE_semestre1/src/menu.c
index ccfcceb..f96aa39 100755
--- a/SAE_semestre1/menu.c
+++ b/SAE_semestre1/src/menu.c
@@ -1,12 +1,16 @@
 #include <stdlib.h>
 #include <graph.h>
 #include <stdio.h>
-#include "main.h"
-#include "time.h"
+#include "../fichier.h/main.h"
+#include "../fichier.h/time.h"
 void Menu_debut(void) {
-    int af = ChargerSprite("../img/image.jpg");
+    int af = ChargerSprite("img/image.jpg");
         AfficherSprite(af, 0, 0);
 }
+void Menu_fin(void){
+    int fin = ChargerSprite("img/Menu_Fin.jpg");
+        AfficherSprite(fin, 0,0);
+}
 int Menu(void) {
     int choix = 1;
     InitialiserGraphique();
@@ -22,20 +26,11 @@ int Menu(void) {
                 case XK_q: /* Changement de XK_q à XK_a*/
                     /*Code pour traiter la touche "a" (fermer le jeu, par exemple)*/
                     FermerGraphique();
-                    exit(EXIT_SUCCESS);
-                    return;
-                /* Ajoutez d'autres cas pour d'autres touches si nécessaire*/
+                    return choix;
             }
         }
     }
 }
-
-int Menu_fin(void){
-       int fin = ChargerSprite("../img/Menu_Fin.png");
-       AfficherSprite(fin, 0,0);
-        Menu();
-}
-
 void bordure(int segment){
     ChoisirCouleurDessin(CouleurParComposante(0,0,0));
     RemplirRectangle(20,720,1180,200);
diff --git a/SAE_semestre1/serpent.c b/SAE_semestre1/src/serpent.c
similarity index 68%
rename from SAE_semestre1/serpent.c
rename to SAE_semestre1/src/serpent.c
index 5dbe8a5..c207ebc 100755
--- a/SAE_semestre1/serpent.c
+++ b/SAE_semestre1/src/serpent.c
@@ -1,5 +1,6 @@
 #include <graph.h>
-#include "serpent.h"
+#include "../fichier.h/serpent.h"
+#include "../fichier.h/main.h"
 
 void Update_Serpent(int pos_x[], int pos_y[], int segment, int old_x[], int old_y[], int* direction){
     int i = 0;
@@ -7,37 +8,45 @@ void Update_Serpent(int pos_x[], int pos_y[], int segment, int old_x[], int old_
         pos_x[i]=old_x[i-1];
         pos_y[i]=old_y[i-1];
     }
-    if (*direction == 1){
+    /*Afficher tête serpent selon la direction*/
+    if (*direction == 1 && *direction !=2 ){
         pos_y[0]=old_y[0]-20;
-        ChargerImage("../img/tete_up.png", pos_x[0], pos_y[0], 0,0,20,20);
+        ChargerImage("img/tete_up.png", pos_x[0], pos_y[0], 0,0,20,20);
     }
-    if (*direction == 2) {
+    if (*direction == 2 && *direction !=1) {
         pos_y[0]=old_y[0]+20;
-        ChargerImage("../img/tete_down.png", pos_x[0], pos_y[0], 0,0,20,20);
+        ChargerImage("img/tete_down.png", pos_x[0], pos_y[0], 0,0,20,20);
     }
-    if (*direction == 3) {
+    if (*direction == 3 && *direction !=4) {
         pos_x[0]=old_x[0]-20;
-        ChargerImage("../img/tete_left.png", pos_x[0], pos_y[0], 0,0,20,20);
+        ChargerImage("img/tete_left.png", pos_x[0], pos_y[0], 0,0,20,20);
     }
-    if (*direction == 4) {
+    if (*direction == 4 && *direction !=3) {
         pos_x[0]=old_x[0]+20;
-        ChargerImage("../img/tete_right.png", pos_x[0], pos_y[0], 0,0,20,20);
+        ChargerImage("img/tete_right.png", pos_x[0], pos_y[0], 0,0,20,20);
    }
     return;
 }
 
 void dessinerSerpent(int pos_x[], int pos_y[], int segment, int old_x[], int old_y[]){
     int i;
+    /*Afficher le serpent*/
     for (i=0 ; i<segment ; i++){
-        ChargerImage("../img/serpent.png", old_x[i], old_y[i],0,0, 20,20);
+        ChargerImage("img/serpent.png", old_x[i], old_y[i],0,0, 20,20);
     }
+    /*Incrémentation du fond par rapport au déplacement du serpent*/
     for (i=0 ; i<segment ; i++){
         ChoisirCouleurDessin(CouleurParComposante(218,209,77));
         RemplirRectangle(old_x[segment-1], old_y[segment-1], 20,20);
-
         old_x[i]=pos_x[i];
         old_y[i]=pos_y[i];
     } 
+    /*Affichier la queue du serpent*/
+    for (i=0 ; i<segment; i++){
+        ChargerImage("img/queue.png", old_x[segment-1], old_y[segment-1],0,0, 20,20);
+        ChoisirCouleurDessin(CouleurParNom("black"));
+        RemplirRectangle(0,0,20,20);
+}
 }
 void Collision_Serpent(int pos_x[], int pos_y[], int segment, int murx[], int mury[], int *go_on){
     int i;
@@ -70,22 +79,22 @@ void Controle(int *direction, int last_direction, int *go_on, int *pause) {
         t = Touche();
         switch(t) {
             case XK_Left:
-                if (last_direction != 4) {
+                if (*direction != 4) {
                     *direction = 3;
                 }
                 return;
             case XK_Right:
-                if (last_direction != 3) {
+                if (*direction != 3) {
                     *direction = 4;
                 }
                 return;
             case XK_Up:
-                if (last_direction != 2) {
+                if (*direction != 2) {
                     *direction = 1;
                 }
                 return;
             case XK_Down:
-                if (last_direction != 1) {
+                if (*direction != 1) {
                     *direction = 2;
                 }
                 return;
@@ -98,7 +107,7 @@ void Controle(int *direction, int last_direction, int *go_on, int *pause) {
                     *pause == 1;
                 }else{
                     *pause = 0;
-                    ChargerImage("../img/PAUSE.png", 400,200,0,0,350,300);
+                    ChargerImage("img/PAUSE.png", 400,200,0,0,350,300);
                 }
         }
     }
diff --git a/SAE_semestre1/terrain.c b/SAE_semestre1/src/terrain.c
similarity index 54%
rename from SAE_semestre1/terrain.c
rename to SAE_semestre1/src/terrain.c
index 1c89988..2683bfe 100755
--- a/SAE_semestre1/terrain.c
+++ b/SAE_semestre1/src/terrain.c
@@ -1,12 +1,14 @@
 #include <stdlib.h>
+#include <stdio.h>
 #include <graph.h>
-#include "time.h"
-#include "terrain.h"
-#include "serpent.h"
-#include "main.h"
-#include "Oeuf.h"
+#include <time.h>
+#include "../fichier.h/time.h"
+#include "../fichier.h/terrain.h"
+#include "../fichier.h/serpent.h"
+#include "../fichier.h/main.h"
+#include "../fichier.h/Oeuf.h"
 
-void DessinerScene(int murx[], int mury[], int minute, int seconde, char timer []){
+void Scene(int murx[], int mury[], int minute, int seconde, char timer []){
     int mur;
     int i;
     snprintf(timer,6,"%02d:%02d", minute ,seconde);
@@ -17,6 +19,6 @@ void DessinerScene(int murx[], int mury[], int minute, int seconde, char timer [
     for(i=0; i<30; i++){
         murx[i] = ((rand() % (55)+1)*20);
         mury[i] = ((rand() % (35)+1)*20);
-         ChargerImage("../img/cactus.png", murx[i], mury[i],0,0, 20,20);
+         ChargerImage("img/cactus.png", murx[i], mury[i],0,0, 20,20);
     }
 }
diff --git a/SAE_semestre1/time.c b/SAE_semestre1/src/time.c
similarity index 90%
rename from SAE_semestre1/time.c
rename to SAE_semestre1/src/time.c
index 9378e0f..f5ef7c8 100755
--- a/SAE_semestre1/time.c
+++ b/SAE_semestre1/src/time.c
@@ -1,10 +1,11 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <graph.h>
-#include "time.h"
-#include "main.h"
-#include "serpent.h"
-#define CYCLE 100000L
+#include "../fichier.h/time.h"
+#include "../fichier.h/main.h"
+#include "../fichier.h/serpent.h"
+#define CYCLE 1000000L
 
 void Score(int segment){
     int nombre;
diff --git a/SAE_semestre1/terrain.h b/SAE_semestre1/terrain.h
deleted file mode 100755
index 038c41d..0000000
--- a/SAE_semestre1/terrain.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef TERRAIN_H
-#define TERRAIN_H
-
-void DessinerScene(int murx[30], int mury[30], int minute, int seconde, char timer []);
-
-#endif