From 13d939a37947b002615a65649508be67f1c8607c Mon Sep 17 00:00:00 2001 From: proal Date: Thu, 1 Dec 2022 17:52:53 +0100 Subject: [PATCH 01/16] =?UTF-8?q?tout=20va=20bien=20mais=20le=20score=20ne?= =?UTF-8?q?=20s'incr=C3=A9mente=20pas=20quand=20il=20faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images.c | 5 +++-- jeu.c | 13 +++++++++---- main.c | 1 - 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/images.c b/images.c index aef7232..9884956 100644 --- a/images.c +++ b/images.c @@ -47,6 +47,7 @@ int tirage_aleatoire(int nb_paires){ for (pos_y=10;pos_y<=370;pos_y=pos_y+90){ for (pos_x=10;pos_x<=640;pos_x=pos_x+90){ if (tab[i]==-1){ + pos_x=650; pos_y=1000; } if (positions[tab[i]][0]==0){ @@ -67,8 +68,8 @@ int tirage_aleatoire(int nb_paires){ } } - /* - for (i=0;i<19;i++){ + + /*for (i=0;i<19;i++){ printf("%03d", i); printf(" "); } diff --git a/jeu.c b/jeu.c index ea3cf78..c0b02e7 100644 --- a/jeu.c +++ b/jeu.c @@ -14,7 +14,7 @@ int jeu(int position[20][4], int nb_paires){ int clic_x,clic_y,im_y,im_x; unsigned long temps, temps2,temps3; char tempstab[50],affichage[50];; - char* comparer[2]; + char* comparer[200]; int tab[3]; couleur c=CouleurParComposante(0,0,0); temps2=Microsecondes(); @@ -71,10 +71,14 @@ int jeu(int position[20][4], int nb_paires){ snprintf(affichage,50,"Images/image%d.png",g); printf("Voici repet: %d\n", repet); printf("Voici affichage: %s\n", affichage); - comparer[repet]=affichage; + if (repet==0){ + comparer[repet]=affichage; + } + printf("Voici comparer[repet]: %s\n", comparer[repet]); printf("Voici comparer[0]: %s\n", comparer[0]); printf("Voici comparer[1]: %s\n\n", comparer[1]); ChargerImage(affichage,im_x,im_y,0,0,80,80); + printf("Voici repet: %d après\n", repet); repet++; } } @@ -86,7 +90,7 @@ int jeu(int position[20][4], int nb_paires){ printf("Voici comparer[1]: %s\n", comparer[1]); /*printf("%d\n", im_x); printf("%d\n", im_y);*/ - if (comparer[0]==comparer[1]){ + if (comparer[0]==affichage){ score++; } repet2=0; @@ -104,6 +108,7 @@ int jeu(int position[20][4], int nb_paires){ } } } - FermerGraphique(); + Touche(); + FermerGraphique(); return EXIT_SUCCESS; } \ No newline at end of file diff --git a/main.c b/main.c index 6f78240..0ad8fe3 100644 --- a/main.c +++ b/main.c @@ -12,6 +12,5 @@ int main(void){ int nb_paires=menu(); char tableautemps[50]; tirage_aleatoire(nb_paires); - FermerGraphique(); return EXIT_SUCCESS; } \ No newline at end of file From c5215d29b9fc9eee812aed1f2cc6f5bc3bae62cc Mon Sep 17 00:00:00 2001 From: proal Date: Thu, 1 Dec 2022 22:32:16 +0100 Subject: [PATCH 02/16] essais --- jeu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeu.c b/jeu.c index c0b02e7..e55cef2 100644 --- a/jeu.c +++ b/jeu.c @@ -78,7 +78,6 @@ int jeu(int position[20][4], int nb_paires){ printf("Voici comparer[0]: %s\n", comparer[0]); printf("Voici comparer[1]: %s\n\n", comparer[1]); ChargerImage(affichage,im_x,im_y,0,0,80,80); - printf("Voici repet: %d après\n", repet); repet++; } } @@ -88,10 +87,11 @@ int jeu(int position[20][4], int nb_paires){ } printf("Voici comparer[0]: %s\n", comparer[0]); printf("Voici comparer[1]: %s\n", comparer[1]); + printf("Voici affichage: %s\n", affichage); /*printf("%d\n", im_x); printf("%d\n", im_y);*/ if (comparer[0]==affichage){ - score++; + score++; } repet2=0; if (score!=20){ From 43f56c5c4c65b62db67ebbafc2fd0e5ef74ea418 Mon Sep 17 00:00:00 2001 From: proal Date: Thu, 1 Dec 2022 23:17:52 +0100 Subject: [PATCH 03/16] CA MARCHE --- jeu.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/jeu.c b/jeu.c index e55cef2..1dff3e7 100644 --- a/jeu.c +++ b/jeu.c @@ -9,12 +9,12 @@ int jeu(int position[20][4], int nb_paires){ int score=0,repet,test=0; int pos_x,pos_y; - int i,j,g; + int i,j,g, stock_g_1, stock_g_2; int repet2, nb_images; int clic_x,clic_y,im_y,im_x; unsigned long temps, temps2,temps3; char tempstab[50],affichage[50];; - char* comparer[200]; + char* comparer1[50], comparer2[50]; int tab[3]; couleur c=CouleurParComposante(0,0,0); temps2=Microsecondes(); @@ -36,8 +36,8 @@ int jeu(int position[20][4], int nb_paires){ //} temps3=temps; repet=0; - comparer[0]="vide"; - comparer[1]="vide"; + /*comparer[0]="vide"; + comparer[1]="vide";*/ while (repet<2){ if (SourisCliquee()){ clic_x=_X; @@ -67,17 +67,18 @@ int jeu(int position[20][4], int nb_paires){ for (i=0;i<20;i++){ for (j=0;j<2;j++){ if (position[i][(j*2)]==im_x && position[i][(j*2+1)]==im_y){ - g=i+1; - snprintf(affichage,50,"Images/image%d.png",g); - printf("Voici repet: %d\n", repet); - printf("Voici affichage: %s\n", affichage); - if (repet==0){ - comparer[repet]=affichage; - } - printf("Voici comparer[repet]: %s\n", comparer[repet]); - printf("Voici comparer[0]: %s\n", comparer[0]); - printf("Voici comparer[1]: %s\n\n", comparer[1]); - ChargerImage(affichage,im_x,im_y,0,0,80,80); + if (repet==0){ + g=i+1; + snprintf(comparer1,50,"Images/image%d.png",g); + ChargerImage(comparer1,im_x,im_y,0,0,80,80); + stock_g_1=g; + } + else{ + g=i+1; + snprintf(comparer2,50,"Images/image%d.png",g); + ChargerImage(comparer2,im_x,im_y,0,0,80,80); + stock_g_2=g; + } repet++; } } @@ -85,16 +86,13 @@ int jeu(int position[20][4], int nb_paires){ } } } - printf("Voici comparer[0]: %s\n", comparer[0]); - printf("Voici comparer[1]: %s\n", comparer[1]); - printf("Voici affichage: %s\n", affichage); /*printf("%d\n", im_x); printf("%d\n", im_y);*/ - if (comparer[0]==affichage){ + if (stock_g_1==stock_g_2){ score++; } repet2=0; - if (score!=20){ + if (score!=nb_paires){ sleep(1); for (pos_y=10;pos_y<=370;pos_y=pos_y+90){ for (pos_x=10;pos_x<=640;pos_x=pos_x+90){ @@ -110,5 +108,5 @@ int jeu(int position[20][4], int nb_paires){ } Touche(); FermerGraphique(); - return EXIT_SUCCESS; + return 1; } \ No newline at end of file From 0b93c9d792693cc2ef458974257cd879c3c4e54e Mon Sep 17 00:00:00 2001 From: proal Date: Thu, 1 Dec 2022 23:22:02 +0100 Subject: [PATCH 04/16] tiens lionel --- main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index 0ad8fe3..3d1b517 100644 --- a/main.c +++ b/main.c @@ -11,6 +11,8 @@ int main(void){ int temps,coucou; int nb_paires=menu(); char tableautemps[50]; - tirage_aleatoire(nb_paires); - return EXIT_SUCCESS; + int x=tirage_aleatoire(nb_paires); + if (x==1){ + return EXIT_SUCCESS; + } } \ No newline at end of file From f989b0ba9777fc245170b349c3916734856de693 Mon Sep 17 00:00:00 2001 From: morinl Date: Thu, 1 Dec 2022 23:26:15 +0100 Subject: [PATCH 05/16] affichage du temps qui fonctionne (normalement) --- jeu.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/jeu.c b/jeu.c index 1dff3e7..6b9cb34 100644 --- a/jeu.c +++ b/jeu.c @@ -25,7 +25,7 @@ int jeu(int position[20][4], int nb_paires){ while(score Date: Thu, 1 Dec 2022 23:37:30 +0100 Subject: [PATCH 06/16] image de fin --- Images/FIN.png | Bin 0 -> 6227 bytes jeu.c | 1 + 2 files changed, 1 insertion(+) create mode 100644 Images/FIN.png diff --git a/Images/FIN.png b/Images/FIN.png new file mode 100644 index 0000000000000000000000000000000000000000..245696338e86fcfaad8203bb8365e3399c822e6a GIT binary patch literal 6227 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 Sud#ndakMoIz-?;wG5-fEAABMJ literal 0 HcmV?d00001 diff --git a/jeu.c b/jeu.c index 6b9cb34..3ff7e9b 100644 --- a/jeu.c +++ b/jeu.c @@ -117,6 +117,7 @@ int jeu(int position[20][4], int nb_paires){ } } } + ChargerImage("./Images/FIN.png",300,500,0,0,445,31); Touche(); FermerGraphique(); return 1; From 876eb3721771aba75158040243ffbc41fff3e523 Mon Sep 17 00:00:00 2001 From: proal Date: Thu, 1 Dec 2022 23:53:31 +0100 Subject: [PATCH 07/16] =?UTF-8?q?une=20paire=20compl=C3=A9t=C3=A9e=20ne=20?= =?UTF-8?q?peut=20plus=20=C3=AAtre=20retourn=C3=A9e=20une=20autre=20fois?= =?UTF-8?q?=20(mais=20est=20masqu=C3=A9e)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeu.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/jeu.c b/jeu.c index 6b9cb34..ddd6b55 100644 --- a/jeu.c +++ b/jeu.c @@ -13,9 +13,8 @@ int jeu(int position[20][4], int nb_paires){ int repet2, nb_images; int clic_x,clic_y,im_y,im_x; unsigned long temps, temps2,temps3; - char tempstab[50],affichage[50];; - char* comparer1[50], comparer2[50]; - int tab[3]; + char tempstab[50],affichage[50]; + int tab[3], ban_list[20]; couleur c=CouleurParComposante(0,0,0); temps2=Microsecondes(); @@ -80,14 +79,14 @@ int jeu(int position[20][4], int nb_paires){ if (position[i][(j*2)]==im_x && position[i][(j*2+1)]==im_y){ if (repet==0){ g=i+1; - snprintf(comparer1,50,"Images/image%d.png",g); - ChargerImage(comparer1,im_x,im_y,0,0,80,80); + snprintf(affichage,50,"Images/image%d.png",g); + ChargerImage(affichage,im_x,im_y,0,0,80,80); stock_g_1=g; } else{ g=i+1; - snprintf(comparer2,50,"Images/image%d.png",g); - ChargerImage(comparer2,im_x,im_y,0,0,80,80); + snprintf(affichage,50,"Images/image%d.png",g); + ChargerImage(affichage,im_x,im_y,0,0,80,80); stock_g_2=g; } repet++; @@ -101,6 +100,10 @@ int jeu(int position[20][4], int nb_paires){ printf("%d\n", im_y);*/ if (stock_g_1==stock_g_2){ score++; + position[stock_g_1-1][0]=0; + position[stock_g_1-1][1]=0; + position[stock_g_1-1][2]=0; + position[stock_g_1-1][3]=0; } repet2=0; if (score!=nb_paires){ @@ -117,7 +120,6 @@ int jeu(int position[20][4], int nb_paires){ } } } - Touche(); FermerGraphique(); return 1; } \ No newline at end of file From e52f7e36be603f511405a77bb6c62b8488bd7614 Mon Sep 17 00:00:00 2001 From: proal Date: Fri, 2 Dec 2022 11:40:27 +0100 Subject: [PATCH 08/16] =?UTF-8?q?les=20paires=20trouv=C3=A9es=20se=20remet?= =?UTF-8?q?tent=20face=20cach=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images.c | 2 +- jeu.c | 46 +++++++++++++++++++++++++++++++++++----------- jeu.h | 2 +- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/images.c b/images.c index 9884956..f9f68a5 100644 --- a/images.c +++ b/images.c @@ -81,7 +81,7 @@ int tirage_aleatoire(int nb_paires){ } printf("\n"); }*/ - score=jeu(positions, nb_paires); + score=jeu(positions, nb_paires, tab); Touche(); FermerGraphique(); printf("\n"); diff --git a/jeu.c b/jeu.c index dbf16fb..9cddea4 100644 --- a/jeu.c +++ b/jeu.c @@ -6,7 +6,7 @@ #include "jeu.h" #include -int jeu(int position[20][4], int nb_paires){ +int jeu(int position[20][4], int nb_paires, int tab[40]){ int score=0,repet,test=0; int pos_x,pos_y; int i,j,g, stock_g_1, stock_g_2; @@ -14,15 +14,18 @@ int jeu(int position[20][4], int nb_paires){ int clic_x,clic_y,im_y,im_x; unsigned long temps, temps2,temps3; char tempstab[50],affichage[50]; - int tab[3], ban_list[20]; + int position_trouvees[20][4]; couleur c=CouleurParComposante(0,0,0); temps2=Microsecondes(); printf("Voici le nombre de paires: %d\n", nb_paires); nb_images=nb_paires*2; score=0; + while(score=10;pos_y=pos_y-90){ if (clic_y>=pos_y){ if (clic_y<=pos_y+80){ @@ -64,6 +68,8 @@ int jeu(int position[20][4], int nb_paires){ } } } + + /*Détecter si le clic était sur l'axe des abcisses d'une image*/ for (pos_x=640;pos_x>=10;pos_x=pos_x-90){ if (clic_x>=pos_x){ if (clic_x<=pos_x+80){ @@ -73,6 +79,7 @@ int jeu(int position[20][4], int nb_paires){ } } + /*Si les deux boucles précédentes ont été vérifiées (si le clic a bien eu lieu sur une image)*/ if (im_x!=0 && im_y!=0){ for (i=0;i<20;i++){ for (j=0;j<2;j++){ @@ -86,6 +93,7 @@ int jeu(int position[20][4], int nb_paires){ stock_g_2=g; } snprintf(affichage,50,"Images/image%d.png",g); + printf("Voici affichage: %s\n",affichage); ChargerImage(affichage,im_x,im_y,0,0,80,80); repet++; } @@ -96,24 +104,40 @@ int jeu(int position[20][4], int nb_paires){ } /*printf("%d\n", im_x); printf("%d\n", im_y);*/ + + /*Si les deux images retournées ont le même numéro*/ if (stock_g_1==stock_g_2){ score++; + for (i=0; i<40;i++){ + if (tab[i]==stock_g_1){ + tab[i]=0; + } + } position[stock_g_1-1][0]=0; position[stock_g_1-1][1]=0; position[stock_g_1-1][2]=0; position[stock_g_1-1][3]=0; } repet2=0; + i=0; if (score!=nb_paires){ sleep(1); for (pos_y=10;pos_y<=370;pos_y=pos_y+90){ for (pos_x=10;pos_x<=640;pos_x=pos_x+90){ - ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80); - repet2++; - if (repet2==nb_images){ - pos_x=750; - pos_y=380; - } + printf("Voici tab[%d]", i); + printf(": %d\n", tab[i]); + + repet2++; + if (repet2==nb_images){ + pos_x=750; + pos_y=380; + } + + if (tab[i]!=0){ + ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80); + } + i++; + } } } diff --git a/jeu.h b/jeu.h index a27c166..4ec6dd3 100644 --- a/jeu.h +++ b/jeu.h @@ -1,6 +1,6 @@ #ifndef JEU_H #define JEU_H -int jeu(int positions[20][4], int nb_paires); +int jeu(int positions[20][4], int nb_paires, int tab[40]); #endif \ No newline at end of file From 19ee66cc3bfe330148215d43861d741b01a1ffa5 Mon Sep 17 00:00:00 2001 From: morinl Date: Fri, 2 Dec 2022 16:12:33 +0100 Subject: [PATCH 09/16] Ajout du score a l'ecran+fin+makefile+mode triche --- Images/FIN.png | Bin 6227 -> 21274 bytes Images/score.png | Bin 0 -> 6416 bytes Makefile | 3 +- images.c | 7 ++-- jeu.c | 81 +++++++++++++++++++++++++++++++++++++++++------ jeu.h | 2 +- main.c | 6 ++-- menu.c | 2 -- 8 files changed, 79 insertions(+), 22 deletions(-) create mode 100644 Images/score.png diff --git a/Images/FIN.png b/Images/FIN.png index 245696338e86fcfaad8203bb8365e3399c822e6a..f5c537806384c42085d2cf892fd290b17167988f 100644 GIT binary patch literal 21274 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 Sud#ndakMoIz-?;wG5-fEAABMJ diff --git a/Images/score.png b/Images/score.png new file mode 100644 index 0000000000000000000000000000000000000000..754522fdca691df9504588db4cf85d22b8e961b3 GIT binary patch literal 6416 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 AA^-pY literal 0 HcmV?d00001 diff --git a/Makefile b/Makefile index c6a41c9..d2b9ec9 100644 --- a/Makefile +++ b/Makefile @@ -13,4 +13,5 @@ menu.o: menu.c menu.h $(CC) menu.c $(CFLAGS) jeu.o: jeu.c jeu.h images.h $(CC) jeu.c $(CFLAGS) -run:./jeu \ No newline at end of file +run: + ./jeu \ No newline at end of file diff --git a/images.c b/images.c index 9884956..8abbfb1 100644 --- a/images.c +++ b/images.c @@ -58,10 +58,7 @@ int tirage_aleatoire(int nb_paires){ positions[tab[i]][2]=pos_x; positions[tab[i]][3]=pos_y; } - /*Triche - snprintf(tirage,50,"Images/image%d.png",(tab[i]+1)); - ChargerImage(tirage,pos_x,pos_y,0,0,80,80);*/ - + /*j'ai mis la triche dans le jeu.c*/ ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80); i++; @@ -81,7 +78,7 @@ int tirage_aleatoire(int nb_paires){ } printf("\n"); }*/ - score=jeu(positions, nb_paires); + score=jeu(positions, nb_paires,tab); Touche(); FermerGraphique(); printf("\n"); diff --git a/jeu.c b/jeu.c index 3ff7e9b..c0faf96 100644 --- a/jeu.c +++ b/jeu.c @@ -6,24 +6,28 @@ #include "jeu.h" #include -int jeu(int position[20][4], int nb_paires){ - int score=0,repet,test=0; +int jeu(int position[20][4], int nb_paires,int tab[40]){ + int score=0,score2,repet,test=0; int pos_x,pos_y; - int i,j,g, stock_g_1, stock_g_2; + int i,j,g,n=0,x=0, stock_g_1, stock_g_2; int repet2, nb_images; int clic_x,clic_y,im_y,im_x; - unsigned long temps, temps2,temps3; - char tempstab[50],affichage[50];; + unsigned long temps, temps2,temps3=1; + char tempstab[50],affichage[50],scoretab[50]; char* comparer1[50], comparer2[50]; - int tab[3]; couleur c=CouleurParComposante(0,0,0); temps2=Microsecondes(); - + ChargerImage("./Images/score.png",760,250,0,0,224,63); printf("Voici le nombre de paires: %d\n", nb_paires); nb_images=nb_paires*2; score=0; + c=CouleurParComposante(255,255,255); ChoisirCouleurDessin(c); + RemplirRectangle(850,320,50,50); + snprintf(scoretab,50,"%d",score); + c=CouleurParComposante(0,0,0); + ChoisirCouleurDessin(c); + EcrireTexte(865,360,scoretab,2); while(score Date: Fri, 2 Dec 2022 16:25:42 +0100 Subject: [PATCH 10/16] Fix du merge --- images.c | 1 - jeu.c | 52 +++++++++++++--------------------------------------- jeu.h | 2 +- 3 files changed, 14 insertions(+), 41 deletions(-) diff --git a/images.c b/images.c index 8abbfb1..ec70382 100644 --- a/images.c +++ b/images.c @@ -58,7 +58,6 @@ int tirage_aleatoire(int nb_paires){ positions[tab[i]][2]=pos_x; positions[tab[i]][3]=pos_y; } - /*j'ai mis la triche dans le jeu.c*/ ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80); i++; diff --git a/jeu.c b/jeu.c index cb896d1..c0faf96 100644 --- a/jeu.c +++ b/jeu.c @@ -28,9 +28,6 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ ChoisirCouleurDessin(c); EcrireTexte(865,360,scoretab,2); while(score=10;pos_y=pos_y-90){ if (clic_y>=pos_y){ if (clic_y<=pos_y+80){ @@ -122,8 +118,6 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ } } } - - /*Détecter si le clic était sur l'axe des abcisses d'une image*/ for (pos_x=640;pos_x>=10;pos_x=pos_x-90){ if (clic_x>=pos_x){ if (clic_x<=pos_x+80){ @@ -133,22 +127,22 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ } } - /*Si les deux boucles précédentes ont été vérifiées (si le clic a bien eu lieu sur une image)*/ if (im_x!=0 && im_y!=0){ for (i=0;i<20;i++){ for (j=0;j<2;j++){ if (position[i][(j*2)]==im_x && position[i][(j*2+1)]==im_y){ if (repet==0){ g=i+1; + snprintf(comparer1,50,"Images/image%d.png",g); + ChargerImage(comparer1,im_x,im_y,0,0,80,80); stock_g_1=g; } else{ g=i+1; + snprintf(comparer2,50,"Images/image%d.png",g); + ChargerImage(comparer2,im_x,im_y,0,0,80,80); stock_g_2=g; } - snprintf(affichage,50,"Images/image%d.png",g); - printf("Voici affichage: %s\n",affichage); - ChargerImage(affichage,im_x,im_y,0,0,80,80); repet++; } } @@ -158,40 +152,20 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ } /*printf("%d\n", im_x); printf("%d\n", im_y);*/ - - /*Si les deux images retournées ont le même numéro*/ if (stock_g_1==stock_g_2){ score++; - for (i=0; i<40;i++){ - if (tab[i]==stock_g_1){ - tab[i]=0; - } - } - position[stock_g_1-1][0]=0; - position[stock_g_1-1][1]=0; - position[stock_g_1-1][2]=0; - position[stock_g_1-1][3]=0; } repet2=0; - i=0; if (score!=nb_paires){ sleep(1); for (pos_y=10;pos_y<=370;pos_y=pos_y+90){ for (pos_x=10;pos_x<=640;pos_x=pos_x+90){ - printf("Voici tab[%d]", i); - printf(": %d\n", tab[i]); - - repet2++; - if (repet2==nb_images){ - pos_x=750; - pos_y=380; - } - - if (tab[i]!=0){ - ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80); - } - i++; - + ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80); + repet2++; + if (repet2==nb_images){ + pos_x=750; + pos_y=380; + } } } } diff --git a/jeu.h b/jeu.h index 4b712fd..256c67b 100644 --- a/jeu.h +++ b/jeu.h @@ -1,6 +1,6 @@ #ifndef JEU_H #define JEU_H -int jeu(int positions[20][4], int nb_paires,int tab); +int jeu(int positions[20][4], int nb_paires,int tab[40]); #endif \ No newline at end of file From 4acf60c5ecdb5a7c3695fdad5bfb625af3f9500b Mon Sep 17 00:00:00 2001 From: proal Date: Fri, 2 Dec 2022 19:33:15 +0100 Subject: [PATCH 11/16] =?UTF-8?q?j'ai=20cass=C3=A9=20ce=20que=20lionel=20a?= =?UTF-8?q?=20fait?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images.c | 4 +++ jeu.c | 80 +++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 30 deletions(-) diff --git a/images.c b/images.c index ec70382..50b2ea9 100644 --- a/images.c +++ b/images.c @@ -76,7 +76,11 @@ int tirage_aleatoire(int nb_paires){ printf(" "); } printf("\n"); + } + for (i=0;i<40;i++){ + printf("%d\n",tab[i]); }*/ + score=jeu(positions, nb_paires,tab); Touche(); FermerGraphique(); diff --git a/jeu.c b/jeu.c index c0faf96..e1c232a 100644 --- a/jeu.c +++ b/jeu.c @@ -10,11 +10,10 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ int score=0,score2,repet,test=0; int pos_x,pos_y; int i,j,g,n=0,x=0, stock_g_1, stock_g_2; - int repet2, nb_images; - int clic_x,clic_y,im_y,im_x; + int repet2, nb_images, nb_trouves[40]; + int clic_x,clic_y,im_y,im_x, indice1, indice2; unsigned long temps, temps2,temps3=1; - char tempstab[50],affichage[50],scoretab[50]; - char* comparer1[50], comparer2[50]; + char tempstab[50],affichage[50],scoretab[50], position_triche[20][4]; couleur c=CouleurParComposante(0,0,0); temps2=Microsecondes(); ChargerImage("./Images/score.png",760,250,0,0,224,63); @@ -27,6 +26,17 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ c=CouleurParComposante(0,0,0); ChoisirCouleurDessin(c); EcrireTexte(865,360,scoretab,2); + + for (i=0;i<40;i++){ + nb_trouves[i]=0; + } + + for (i=0;i<4;i++){ + for (j=0;j<20;j++){ + position_triche[j][i]=position[j][i]; + } + } + while(score Date: Fri, 2 Dec 2022 19:46:42 +0100 Subject: [PATCH 12/16] bim bam boum bidiblipblap --- jeu.c | 80 ++++++++++++++++++++++------------------------------------- 1 file changed, 30 insertions(+), 50 deletions(-) diff --git a/jeu.c b/jeu.c index e1c232a..c0faf96 100644 --- a/jeu.c +++ b/jeu.c @@ -10,10 +10,11 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ int score=0,score2,repet,test=0; int pos_x,pos_y; int i,j,g,n=0,x=0, stock_g_1, stock_g_2; - int repet2, nb_images, nb_trouves[40]; - int clic_x,clic_y,im_y,im_x, indice1, indice2; + int repet2, nb_images; + int clic_x,clic_y,im_y,im_x; unsigned long temps, temps2,temps3=1; - char tempstab[50],affichage[50],scoretab[50], position_triche[20][4]; + char tempstab[50],affichage[50],scoretab[50]; + char* comparer1[50], comparer2[50]; couleur c=CouleurParComposante(0,0,0); temps2=Microsecondes(); ChargerImage("./Images/score.png",760,250,0,0,224,63); @@ -26,17 +27,6 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ c=CouleurParComposante(0,0,0); ChoisirCouleurDessin(c); EcrireTexte(865,360,scoretab,2); - - for (i=0;i<40;i++){ - nb_trouves[i]=0; - } - - for (i=0;i<4;i++){ - for (j=0;j<20;j++){ - position_triche[j][i]=position[j][i]; - } - } - while(score Date: Fri, 2 Dec 2022 20:09:13 +0100 Subject: [PATCH 13/16] =?UTF-8?q?r=C3=A9glages=20de=20bugs=20mineurs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeu.c | 74 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/jeu.c b/jeu.c index c0faf96..f8a228e 100644 --- a/jeu.c +++ b/jeu.c @@ -11,10 +11,10 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ int pos_x,pos_y; int i,j,g,n=0,x=0, stock_g_1, stock_g_2; int repet2, nb_images; - int clic_x,clic_y,im_y,im_x; + int clic_x,clic_y,im_y,im_x, im_x_1, im_x_2, im_y_1, im_y_2; unsigned long temps, temps2,temps3=1; char tempstab[50],affichage[50],scoretab[50]; - char* comparer1[50], comparer2[50]; + couleur c=CouleurParComposante(0,0,0); temps2=Microsecondes(); ChargerImage("./Images/score.png",760,250,0,0,224,63); @@ -28,6 +28,7 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ ChoisirCouleurDessin(c); EcrireTexte(865,360,scoretab,2); while(score=10;pos_y=pos_y-90){ if (clic_y>=pos_y){ if (clic_y<=pos_y+80){ im_y=pos_y; + if (repet==0){ + im_y_1=pos_y; + } + else{ + im_y_2=pos_y; + } break; } } @@ -122,27 +116,31 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ if (clic_x>=pos_x){ if (clic_x<=pos_x+80){ im_x=pos_x; + if (repet==0){ + im_x_1=pos_x; + } + else{ + im_x_2=pos_x; + } break; } } } - if (im_x!=0 && im_y!=0){ + if (im_x!=0 && im_y!=0 && im_x_1!=im_x_2 && im_y_1!=im_y_2){ for (i=0;i<20;i++){ for (j=0;j<2;j++){ if (position[i][(j*2)]==im_x && position[i][(j*2+1)]==im_y){ + g=i+1; if (repet==0){ - g=i+1; - snprintf(comparer1,50,"Images/image%d.png",g); - ChargerImage(comparer1,im_x,im_y,0,0,80,80); stock_g_1=g; } else{ - g=i+1; - snprintf(comparer2,50,"Images/image%d.png",g); - ChargerImage(comparer2,im_x,im_y,0,0,80,80); stock_g_2=g; } + snprintf(affichage,50,"Images/image%d.png",g); + ChargerImage(affichage,im_x,im_y,0,0,80,80); + printf("%s\n", affichage); repet++; } } @@ -153,7 +151,17 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ /*printf("%d\n", im_x); printf("%d\n", im_y);*/ if (stock_g_1==stock_g_2){ + position[stock_g_1-1][0]=0; + position[stock_g_1-1][1]=0; + position[stock_g_1-1][2]=0; + position[stock_g_1-1][3]=0; score++; + for (i=0;i<40;i++){ + if (tab[i]==stock_g_1){ + printf("oui"); + //nb_trouves[i]=tab[i]; + } + } } repet2=0; if (score!=nb_paires){ From d3317aad156a2ea54c73647635bd310cb0005c6f Mon Sep 17 00:00:00 2001 From: proal Date: Fri, 2 Dec 2022 20:32:05 +0100 Subject: [PATCH 14/16] correction de quelques bugs --- jeu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jeu.c b/jeu.c index f8a228e..e407878 100644 --- a/jeu.c +++ b/jeu.c @@ -21,7 +21,8 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ printf("Voici le nombre de paires: %d\n", nb_paires); nb_images=nb_paires*2; score=0; - c=CouleurParComposante(255,255,255); ChoisirCouleurDessin(c); + c=CouleurParComposante(255,255,255); + ChoisirCouleurDessin(c); RemplirRectangle(850,320,50,50); snprintf(scoretab,50,"%d",score); c=CouleurParComposante(0,0,0); @@ -127,7 +128,7 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ } } - if (im_x!=0 && im_y!=0 && im_x_1!=im_x_2 && im_y_1!=im_y_2){ + if (im_x!=0 && im_y!=0 && (im_x_1!=im_x_2 || im_y_1!=im_y_2)){ for (i=0;i<20;i++){ for (j=0;j<2;j++){ if (position[i][(j*2)]==im_x && position[i][(j*2+1)]==im_y){ @@ -168,7 +169,9 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ sleep(1); for (pos_y=10;pos_y<=370;pos_y=pos_y+90){ for (pos_x=10;pos_x<=640;pos_x=pos_x+90){ + if (position) ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80); + repet2++; if (repet2==nb_images){ pos_x=750; From d1c864e74b9bd27df17af8dc70ae99d92eec0251 Mon Sep 17 00:00:00 2001 From: proal Date: Fri, 2 Dec 2022 20:51:34 +0100 Subject: [PATCH 15/16] =?UTF-8?q?mal=20=C3=A0=20la=20t=C3=AAte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jeu.c b/jeu.c index e407878..f795dd4 100644 --- a/jeu.c +++ b/jeu.c @@ -168,8 +168,7 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ if (score!=nb_paires){ sleep(1); for (pos_y=10;pos_y<=370;pos_y=pos_y+90){ - for (pos_x=10;pos_x<=640;pos_x=pos_x+90){ - if (position) + for (pos_x=10;pos_x<=640;pos_x=pos_x+90){ ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80); repet2++; From 4db49b6ccb00dec38ffcfb67a6f74abcb4b0d92c Mon Sep 17 00:00:00 2001 From: morinl Date: Sat, 3 Dec 2022 16:38:44 +0100 Subject: [PATCH 16/16] fix du mode triche --- jeu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeu.c b/jeu.c index f795dd4..3864b80 100644 --- a/jeu.c +++ b/jeu.c @@ -58,7 +58,7 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ temps3=temps; /*Triche*/ - if(ToucheEnAttente() && Touche(XK_t)){ + if(ToucheEnAttente() && Touche()==XK_t){ n=0; while(n<1){ x=0; @@ -73,7 +73,7 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){ x++; } } - if(ToucheEnAttente() && Touche(XK_t)){ + if(ToucheEnAttente() && Touche()==XK_t){ x=0; for (pos_y=10;pos_y<=370;pos_y=pos_y+90){ for (pos_x=10;pos_x<=640;pos_x=pos_x+90){