From 100b99bd9940e4a9a7224ac043b96946d90b4c05 Mon Sep 17 00:00:00 2001
From: brigitte <wilfried.brigitte@etu.u-pec.fr>
Date: Thu, 7 Dec 2023 14:02:18 +0100
Subject: [PATCH] organisation du code + makefile

---
 JEUX_SERPENT/Makefile   |  37 ++++----
 JEUX_SERPENT/fonction.h |  36 +++++++-
 JEUX_SERPENT/main.c     | 191 ++--------------------------------------
 JEUX_SERPENT/pomme.c    |  20 -----
 JEUX_SERPENT/scene.c    |  47 ++++++++++
 JEUX_SERPENT/score.c    |  16 ++++
 JEUX_SERPENT/serpent    | Bin 0 -> 17480 bytes
 JEUX_SERPENT/serpent.c  |  10 +++
 JEUX_SERPENT/terrain.c  |  12 ---
 JEUX_SERPENT/timer.c    |   3 +-
 10 files changed, 134 insertions(+), 238 deletions(-)
 delete mode 100644 JEUX_SERPENT/pomme.c
 create mode 100644 JEUX_SERPENT/scene.c
 create mode 100644 JEUX_SERPENT/score.c
 create mode 100755 JEUX_SERPENT/serpent
 delete mode 100644 JEUX_SERPENT/terrain.c

diff --git a/JEUX_SERPENT/Makefile b/JEUX_SERPENT/Makefile
index d66f443..7e46f00 100644
--- a/JEUX_SERPENT/Makefile
+++ b/JEUX_SERPENT/Makefile
@@ -1,25 +1,24 @@
-but:Snake
+CC=gcc
+CFLAGS=-ansi -pedantic -lgraph
 
-OFILES=main.o\
-	 	 serpent.o\
-			 terrain.o\
-				 pomme.o\
-					 timer.o\
-						fonction.o
+all:serpent
 
-CC= gcc
-CFLAGS= -ansi -pedantic -g -lgraph
+serpent:main.o scene.o serpent.o timer.o score.o
+	$(CC) $(CFLAGS) -o serpent main.o scene.o serpent.o timer.o score.o 
 
-fonction.o:fonction.h
-main.o:main.c
-serpent.o:serpent.c
-terrain.o:terrain.c
-pomme.o:pomme.c
-timer.o:timer.c
+main.o:main.c fonction.h
+	$(CC) -c main.c $(CFLAGS)
 
-Snake:$(OFILES) 
-	$(CC) $(CFLAGS)Snake $(OFILES)
+scene.o:scene.c fonction.h
+	$(CC) -c scene.c $(CFLAGS)
 
-clean:-rm -f $(OFLIES)Snake
+serpent.o: serpent.c fonction.h
+	$(CC) -c serpent.c $(CFLAGS)
 
-.PHONY:but clean
+timer.o:timer.c fonction.h
+	$(CC) -c timer.c $(CFLAGS)
+
+score.o:score.c fonction.h
+	$(CC) -c score.c $(CFLAGS)
+
+clean:-rm -f *.o serpent
diff --git a/JEUX_SERPENT/fonction.h b/JEUX_SERPENT/fonction.h
index fcd0b96..05ddd0b 100644
--- a/JEUX_SERPENT/fonction.h
+++ b/JEUX_SERPENT/fonction.h
@@ -1,5 +1,35 @@
-#ifndef MAIN.H
-#define MAIN.H
+#ifndef FONCTION_H
+#define FONCTION_H
+#include <stdlib.h>
+#include <stdio.h>
+#include <graph.h>
+#include <time.h>
+#include <unistd.h>
+
+
+extern int seconde, minute, seconde_actuel, old_seconde;
+extern char timer[6];
+extern unsigned long int suivant;
+
+extern int serpent;
+extern int x, y, direction, t, segment, i;
+extern int pos_x[60], pos_y[60], old_x[60], old_y[60];
+
+extern int p, pp, pomme, pommex[5], pommey[5];
+extern int fond, Nbr;
+extern char score[4];
+
+extern int go_on;
+
+void Pomme();
+void Controle();
+void Serpent();
+void Update_Serpent();
+void Terrain();
+void Timer();
+void Update_Timer();
+void DessinerScene();
+void Score();
+void Collision();
 
-void Pomme();void Controle();void Serpent();void Update_Serpent();void Terrain();void Timer();void Update_Timer();
 #endif
\ No newline at end of file
diff --git a/JEUX_SERPENT/main.c b/JEUX_SERPENT/main.c
index e950698..74f1ac3 100644
--- a/JEUX_SERPENT/main.c
+++ b/JEUX_SERPENT/main.c
@@ -3,199 +3,24 @@
 #include <graph.h>
 #include <time.h>
 #include <unistd.h>
+#include "fonction.h"
 #define CYCLE 10000L
 
-/*timer*/
-int seconde=0;
-int minute=0;
-int seconde_actuel=0;
-int old_seconde=0;
+
+int seconde, minute, seconde_actuel, old_seconde;
 char timer[6];
 unsigned long int suivant;
-/*serpent*/
+
 int serpent;
-int x = 600;
-int y = 400;
-int direction = 4; /*1 : vers le haut , 2 : vers le bas; 3 : vers la gauche, 4 : vers la droite*/
-int t;
-int segment=10;
-int i=0;
-int pos_x[60];
-int pos_y[60];
-int old_x[60];
-int old_y[60];
-/*variable pomme*/
-int p=0;
-int pp=0;
-int pomme, pommex[5], pommey[5];
+int x=500, y=500, direction=1, t, segment=10, i;
+int pos_x[60], pos_y[60], old_x[60], old_y[60];
+
+int p, pp, pomme, pommex[5], pommey[5];
 int fond, Nbr;
 char score[4];
 
-/*fin de jeu*/
 int go_on=1;
 
-/*Fonction Pour créer la première scene du jeu*/
-void DessinerScene(){
-	snprintf(timer,6,"%02d:%02d", minute, seconde);
-    ChoisirCouleurDessin(CouleurParComposante(5,130,4));
-    RemplirRectangle(20,20,1160,700);
-    ChoisirCouleurDessin(CouleurParComposante(255,255,255)); 
-    EcrireTexte(10,760,timer,2);
-    serpent=ChargerSprite("IMG/serpent.png");
-    fond=ChargerSprite("IMG/fond.png");
-
-    for (i = 0; i < segment; i++){
-    	AfficherSprite(serpent, x-(i*20), y); 
-    	pos_x[i]=x-(i*20);
-    	pos_y[i]=y;
-    	old_y[i]=pos_y[i];
-    	old_x[i]=pos_x[i];
-	}
-	srand(time(NULL)); 
-	pomme=ChargerSprite("IMG/pomme.png");
-	for (p = 0; p < 5; p++) {
-    	pommex[p] = ((rand() % (58)+1)*20);
-    	pommey[p] = ((rand() % (35)+1)*20);
-    	AfficherSprite(pomme, pommex[p], pommey[p]);
-    }
-}
-
-void Terrain(){
-    if (pos_x[0] >1140 || pos_x[0]<=20)
-        go_on=0;
-    if (pos_y[0]<40 || pos_y[0] >=680)
-        go_on=0;
-}
-
-/*Fonction pour calculer le temps*/
-void 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();
-            }else{
-                seconde = seconde+1;
-                Update_Timer();
-            }
-        }
-    }
-}
-
-/*Fonction pour mettre à jour unuquement le timer*/
-void Update_Timer(void){
-    snprintf(timer,6,"%02d:%02d", minute, seconde);
-    ChoisirCouleurDessin(CouleurParComposante(0,0,0)); 
-    RemplirRectangle(0,700,1200,800);
-    ChoisirCouleurDessin(CouleurParComposante(255,255,255)); 
-    EcrireTexte(10,750,timer,2);
-}
-
-void Score(){
-    Nbr=(segment-10)*10;
-    snprintf(score,4,"%04d0", Nbr);
-    ChoisirCouleurDessin(CouleurParComposante(0,0,0)); 
-    RemplirRectangle(1100,730,1200,800);
-    ChoisirCouleurDessin(CouleurParComposante(255,255,255));
-    EcrireTexte(1000,750,"Score :",2);
-    EcrireTexte(1100,750,score,2);
-}
-
-/*Input Serpent*/
-void Controle(){
-    while(ToucheEnAttente()){
-        t = Touche();
-        switch(t){  
-            case XK_Left : 
-                direction=3;
-                break;
-            case XK_Right:
-                direction=4;
-                break;
-            case XK_Up:
-                direction=1;
-                break;
-            case XK_Down:
-                direction=2;
-                break;
-            case XK_Escape:
-                go_on=0;
-                break;  
-            case XK_p:
-                direction=0;
-            break;  
-        }
-    }
-}
-
-/*Avancement automatique du serpent en fonction de la direction*/
-void Serpent(){     
-    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(p=0; p<5; p++){
-        if(pommex[p]==pos_x[0] && pommey[p]==pos_y[0]){
-            segment+=2;
-            pommex[p] = ((rand() % (58)+1)*20);
-            pommey[p] = ((rand() % (35)+1)*20);
-        }
-    }
-
-    Update_Serpent();
-    Terrain();
-    usleep(100000);
-}
-
-void Collision(){
-    if(seconde!=0 || minute!=0){
-        for(i=1; i<segment;i++){
-            if (pos_x[0]==pos_x[i] && pos_y[0]==pos_y[i]){
-                go_on=0;
-            }
-        }
-    }
-}
-
-/*fonction pour mettre à jour la position du serpent*/
-void Update_Serpent(void){
-    AfficherSprite(fond, pos_x[segment-1], pos_y[segment-1]);
-    AfficherSprite(serpent, pos_x[0], pos_y[0]);
-    for (i=1 ; i<segment ; i++){
-        pos_x[i]=old_x[i-1];
-        pos_y[i]=old_y[i-1];
-        AfficherSprite(serpent, pos_x[i], pos_y[i]);
-    }
-    old_x[0]=pos_x[0];
-    old_y[0]=pos_y[0];
-    for (i=1 ; i<segment ; i++){
-        old_x[i]=pos_x[i];
-        old_y[i]=pos_y[i];
-    }
-}
-
-/*Apparition aléatoire des pommes*/
-void Pomme(){
-
-    for (pp = 0; pp < 5; ++pp) {
-        AfficherSprite(pomme, pommex[pp], pommey[pp]);
-    }
-
-}
-
 /*Fonction Principale*/
 int main(){
 	
diff --git a/JEUX_SERPENT/pomme.c b/JEUX_SERPENT/pomme.c
deleted file mode 100644
index 05f39d0..0000000
--- a/JEUX_SERPENT/pomme.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <graph.h>
-#include <time.h>
-#include <unistd.h>
-
-/*variable pomme*/
-int p=0;
-int pp=0;
-int pomme, pommex[5], pommey[5];
-int fond;
-
-/*Apparition aléatoire des pommes*/
-void Pomme(){
-
-	for (pp = 0; pp < 5; ++pp) {
-		AfficherSprite(pomme, pommex[pp], pommey[pp]);
-	}
-
-}
\ No newline at end of file
diff --git a/JEUX_SERPENT/scene.c b/JEUX_SERPENT/scene.c
new file mode 100644
index 0000000..c81a7dc
--- /dev/null
+++ b/JEUX_SERPENT/scene.c
@@ -0,0 +1,47 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <graph.h>
+#include <time.h>
+#include <unistd.h>
+#include "fonction.h"
+
+void Terrain(){
+	if (pos_x[0] >1140 || pos_x[0]<=20)
+		go_on=0;
+	if (pos_y[0]<40 || pos_y[0] >=680)
+		go_on=0;
+}
+
+/*Fonction Pour créer la première scene du jeu*/
+void DessinerScene(){
+	snprintf(timer,6,"%02d:%02d", minute, seconde);
+    ChoisirCouleurDessin(CouleurParComposante(5,130,4));
+    RemplirRectangle(20,20,1160,700);
+    ChoisirCouleurDessin(CouleurParComposante(255,255,255)); 
+    EcrireTexte(10,760,timer,2);
+    serpent=ChargerSprite("IMG/serpent.png");
+    fond=ChargerSprite("IMG/fond.png");
+
+    for (i = 0; i < segment; i++){
+    	AfficherSprite(serpent, x-(i*20), y); 
+    	pos_x[i]=x-(i*20);
+    	pos_y[i]=y;
+    	old_y[i]=pos_y[i];
+    	old_x[i]=pos_x[i];
+	}
+	srand(time(NULL)); 
+	pomme=ChargerSprite("IMG/pomme.png");
+	for (p = 0; p < 5; p++) {
+    	pommex[p] = ((rand() % (58)+1)*20);
+    	pommey[p] = ((rand() % (35)+1)*20);
+    	AfficherSprite(pomme, pommex[p], pommey[p]);
+    }
+}
+/*Apparition aléatoire des pommes*/
+void Pomme(){
+
+	for (pp = 0; pp < 5; ++pp) {
+		AfficherSprite(pomme, pommex[pp], pommey[pp]);
+	}
+
+}
\ No newline at end of file
diff --git a/JEUX_SERPENT/score.c b/JEUX_SERPENT/score.c
new file mode 100644
index 0000000..0040b38
--- /dev/null
+++ b/JEUX_SERPENT/score.c
@@ -0,0 +1,16 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <graph.h>
+#include <time.h>
+#include <unistd.h>
+#include "fonction.h"
+
+void Score(){
+    Nbr=(segment-10)*10;
+    snprintf(score,4,"%04d0", Nbr);
+    ChoisirCouleurDessin(CouleurParComposante(0,0,0)); 
+    RemplirRectangle(1100,730,1200,800);
+    ChoisirCouleurDessin(CouleurParComposante(255,255,255));
+    EcrireTexte(1000,750,"Score :",2);
+    EcrireTexte(1100,750,score,2);
+}
\ No newline at end of file
diff --git a/JEUX_SERPENT/serpent b/JEUX_SERPENT/serpent
new file mode 100755
index 0000000000000000000000000000000000000000..f1e9085060cfc2f1ff3b7f8bad8a7bb107a793f0
GIT binary patch
literal 17480
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
X*UP$7P_U^;(N7mBjZ<v~Hdg!(r86F>

literal 0
HcmV?d00001

diff --git a/JEUX_SERPENT/serpent.c b/JEUX_SERPENT/serpent.c
index db9b266..7c45c61 100644
--- a/JEUX_SERPENT/serpent.c
+++ b/JEUX_SERPENT/serpent.c
@@ -3,6 +3,7 @@
 #include <graph.h>
 #include <time.h>
 #include <unistd.h>
+#include "fonction.h"
 
 /*Input Serpent*/
 void Controle(){
@@ -76,3 +77,12 @@ void Update_Serpent(){
 	}
 }
 
+void Collision(){
+    if(seconde!=0 || minute!=0){
+        for(i=1; i<segment;i++){
+            if (pos_x[0]==pos_x[i] && pos_y[0]==pos_y[i]){
+                go_on=0;
+            }
+        }
+    }
+}
diff --git a/JEUX_SERPENT/terrain.c b/JEUX_SERPENT/terrain.c
deleted file mode 100644
index 7090e39..0000000
--- a/JEUX_SERPENT/terrain.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <graph.h>
-#include <time.h>
-#include <unistd.h>
-
-void Terrain(){
-	if (pos_x[0] >1140 || pos_x[0]<=20)
-		go_on=0;
-	if (pos_y[0]<40 || pos_y[0] >=680)
-		go_on=0;
-}
\ No newline at end of file
diff --git a/JEUX_SERPENT/timer.c b/JEUX_SERPENT/timer.c
index e63ac0d..73e288a 100644
--- a/JEUX_SERPENT/timer.c
+++ b/JEUX_SERPENT/timer.c
@@ -3,10 +3,11 @@
 #include <graph.h>
 #include <time.h>
 #include <unistd.h>
+#include "fonction.h"
 #define CYCLE 10000L
 
 /*Fonction pour calculer le temps*/
-void Timer(unsigned long int suivant, char timer[6], int old_seconde=0, int seconde=0,int minute=0,int seconde_actuel=0){
+void Timer(){
 	if(Microsecondes()> suivant){
 		suivant = Microsecondes()+CYCLE;
 		seconde_actuel = (suivant/1000000)%10;