morinl/SAE11_2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ajout des variables dans jeu.c + modif makefile

Browse Source
This commit is contained in:
morinl 2022-11-30 17:41:26 +01:00
parent e6a058de5d
commit ccab398cdc
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -3,11 +3,11 @@ CFLAGS= -Wall -c -lgraph
LDFLAGS= -Wall -lgraph LDFLAGS= -Wall -lgraph
EXEC=menu EXEC=menu
jeu: main.o images.o menu.o temps.o jeu: main.o images.o menu.o temps.o jeu.o
$(CC) -o jeu main.o images.o menu.o temps.o $(LDFLAGS) $(CC) -o jeu main.o images.o menu.o temps.o $(LDFLAGS)
main.o: main.c images.h menu.h main.h main.o: main.c images.h menu.h main.h
$(CC) main.c $(CFLAGS) $(CC) main.c $(CFLAGS)
images.o: images.c images.h jeu.h images.o: images.c images.h
$(CC) images.c $(CFLAGS) $(CC) images.c $(CFLAGS)
menu.o: menu.c menu.h menu.o: menu.c menu.h
$(CC) menu.c $(CFLAGS) $(CC) menu.c $(CFLAGS)

7
images.c
View File

@ -10,12 +10,11 @@ int tirage_aleatoire(void){
InitialiserGraphique(); InitialiserGraphique();
char tirage[50], affichage[50]; char tirage[50], affichage[50];
int pos_x, pos_y, clic_x, clic_y, im_y, im_x; int pos_x, pos_y, clic_x, clic_y, im_y, im_x;
int i, j, g; int i, j;
int nb, score=0; int nb;
int tab[40]; int tab[40];
int nb_paires=20; int nb_paires=20;
int positions[20][4]; int positions[20][4];
int repet;
char* comparer[2]; char* comparer[2];
ChargerImage("Images/background.png",0,0,0,0,1024,576); ChargerImage("Images/background.png",0,0,0,0,1024,576);
@ -32,7 +31,7 @@ int tirage_aleatoire(void){
/*Tirage des images*/ /*Tirage des images*/
srand(time(NULL)); srand(time(NULL));
for (i=0;i<2;i++){ for (i=0;i<2;i++){
for (j=0;j<nb_paires;j++){ for (j=0;j<nb_paires;j++){
nb=rand()%(nb_paires*2); nb=rand()%(nb_paires*2);
if (tab[nb]!=-1){ if (tab[nb]!=-1){

7
jeu.c
View File

@ -8,9 +8,13 @@
#include <unistd.h> #include <unistd.h>
int jeu(void){ int jeu(void){
int temps; int temps,score,repet;
int i,j,g;
int clic_x,clic_y,im_y,im_x;
char tempstab[50];
while(score<20){ while(score<20){
temps=timer(); temps=timer();
snprintf(tempstab,50,"%d secondes écoulées",temps);
for (repet=0;repet<3;repet++){ for (repet=0;repet<3;repet++){
if (SourisCliquee()){ if (SourisCliquee()){
clic_x=_X; clic_x=_X;
@ -53,4 +57,5 @@ int jeu(void){
} }
} }
} }
return score;
} }