stiti/SAE11_2023
stiti/SAE11_2023
1
6
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Peer Working : correction bug

Browse Source
This commit is contained in:
stiti 2023-12-11 18:56:40 +01:00
parent 909d4bfb7b
commit 12c620e5bb
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/serpent.h
View File

@ -6,7 +6,7 @@ typedef struct {
} Segment; } Segment;
void initialiserSerpent(Segment serpent[], int *longueur); void initialiserSerpent(Segment serpent[], int *longueur);
void gestionDeplacements(Segment serpent[], int *direction_x, int *direction_y); int gestionDeplacements(Segment serpent[], int *direction_x, int *direction_y);
int tuerSerpent(Segment serpent[], int longueur); int tuerSerpent(Segment serpent[], int longueur);
void mettreAJourSerpent(Segment serpent[], int *longueur, int *direction_x, int *direction_y); void mettreAJourSerpent(Segment serpent[], int *longueur, int *direction_x, int *direction_y);
void dessinerSerpent(Segment serpent[], int *longueur); void dessinerSerpent(Segment serpent[], int *longueur);

28
src/jeu.c
View File

@ -33,6 +33,7 @@ void lancer_jeu1(void) {
Pomme pomme; Pomme pomme;
int min, sec; int min, sec;
int id_pomme; int id_pomme;
int esc=0;
initialiser_timer(&min, &sec); initialiser_timer(&min, &sec);
@ -45,7 +46,10 @@ void lancer_jeu1(void) {
while (fin == 1) { while (fin == 1) {
update_timer(&min, &sec); update_timer(&min, &sec);
gestionDeplacements(serpent, &direction_x, &direction_y); esc=gestionDeplacements(serpent, &direction_x, &direction_y);
if(esc==1){ /*verifie si on appuie sur échap */
return; /*quitte si on appuie sur échap*/
}
mettreAJourSerpent(serpent, &longueur, &direction_x, &direction_y); mettreAJourSerpent(serpent, &longueur, &direction_x, &direction_y);
if (serpent[0].x == pomme.x && serpent[0].y == pomme.y) { if (serpent[0].x == pomme.x && serpent[0].y == pomme.y) {
@ -87,6 +91,7 @@ void lancer_jeu2(void) {
Pomme pommes[5]; Pomme pommes[5];
int min, sec; int min, sec;
int id_pomme; int id_pomme;
int esc;
initialiser_timer(&min, &sec); initialiser_timer(&min, &sec);
@ -100,7 +105,10 @@ void lancer_jeu2(void) {
} }
while (1) { while (1) {
gestionDeplacements(serpent, &direction_x, &direction_y); esc=gestionDeplacements(serpent, &direction_x, &direction_y);
if(esc==1){/*verifie si on appuie sur échap */
return; /*quitte si on appuie sur échap*/
}
mettreAJourSerpent(serpent, &longueur, &direction_x, &direction_y); mettreAJourSerpent(serpent, &longueur, &direction_x, &direction_y);
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
@ -145,6 +153,7 @@ void lancer_jeu4(void) {
Segment serpent[100]; Segment serpent[100];
int min, sec; int min, sec;
int id_pomme; int id_pomme;
int esc=0;
initialiser_timer(&min, &sec); initialiser_timer(&min, &sec);
@ -156,7 +165,10 @@ void lancer_jeu4(void) {
dessinerPomme(pomme,id_pomme); dessinerPomme(pomme,id_pomme);
while (1) { while (1) {
gestionDeplacements(serpent, &direction_x, &direction_y); esc=gestionDeplacements(serpent, &direction_x, &direction_y);
if(esc==1){/*verifie si on appuie sur échap */
return;/*quitte si on appuie sur echap*/
}
mettreAJourSerpent(serpent, &longueur, &direction_x, &direction_y); mettreAJourSerpent(serpent, &longueur, &direction_x, &direction_y);
if (serpent[0].x == pomme.x && serpent[0].y == pomme.y) { if (serpent[0].x == pomme.x && serpent[0].y == pomme.y) {
@ -201,6 +213,7 @@ void lancer_jeu3(void) {
Pomme pommes[25]; Pomme pommes[25];
int min, sec; int min, sec;
int id_pomme; int id_pomme;
int esc=0;
initialiser_timer(&min, &sec); initialiser_timer(&min, &sec);
@ -213,7 +226,10 @@ void lancer_jeu3(void) {
} }
while (1) { while (1) {
gestionDeplacements(serpent, &direction_x, &direction_y); esc=gestionDeplacements(serpent, &direction_x, &direction_y);
if(esc==1){
return;
}
mettreAJourSerpent(serpent, &longueur, &direction_x, &direction_y); mettreAJourSerpent(serpent, &longueur, &direction_x, &direction_y);
for (i = 0; i < 25; i++) { for (i = 0; i < 25; i++) {
@ -244,9 +260,5 @@ void lancer_jeu3(void) {
update_timer(&min, &sec); update_timer(&min, &sec);
attendreSerpent(vitesse); /*Gère la vitesse*/ attendreSerpent(vitesse); /*Gère la vitesse*/
/*if (ToucheEnAttente() && Touche() == XK_Escape) {
return;
}*/
} }
} }

5
src/serpent.c
View File

@ -21,7 +21,7 @@ void initialiserSerpent(Segment serpent[], int *longueur) {
*longueur = 10; *longueur = 10;
} }
void gestionDeplacements(Segment serpent[], int *direction_x, int *direction_y) { int gestionDeplacements(Segment serpent[], int *direction_x, int *direction_y) {
int touche; int touche;
if (ToucheEnAttente()) { if (ToucheEnAttente()) {
touche = Touche(); touche = Touche();
@ -39,8 +39,11 @@ void gestionDeplacements(Segment serpent[], int *direction_x, int *direction_y)
*direction_y = 0; *direction_y = 0;
} else if (touche == XK_space) { } else if (touche == XK_space) {
pause(); pause();
} else if(touche == XK_Escape){
return 1;
} }
} }
return 0;
} }
int tuerSerpent(Segment serpent[], int longueur) { int tuerSerpent(Segment serpent[], int longueur) {