From 4f6efa071c5aae0f07bd042e1f9900ecd2a55b45 Mon Sep 17 00:00:00 2001
From: proal <login@domaine.example>
Date: Fri, 2 Dec 2022 20:09:13 +0100
Subject: [PATCH] =?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<nb_paires){
+
         temps=(Microsecondes()-temps2)/1000000;
 		if(temps!=temps3){
 			snprintf(tempstab,50,"%ld secondes ecoulees",temps);
@@ -54,6 +55,7 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){
 				EcrireTexte(867,100,tempstab,0);
 			}
 			temps3=temps;
+
 			/*Triche*/
 			if(ToucheEnAttente() && Touche(XK_t)){
 				n=0;
@@ -64,19 +66,10 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){
 							if (tab[x]==-1){
 								pos_x=650;
 								pos_y=1000;
-								}
-								if (position[tab[x]][0]==0){
-									position[tab[x]][0]=pos_x;
-									position[tab[x]][1]=pos_y;
-									}
-									else{
-										position[tab[x]][2]=pos_x;
-										position[tab[x]][3]=pos_y;
-										}
-										
-										snprintf(affichage,50,"Images/image%d.png",(tab[x]+1));
-										ChargerImage(affichage,pos_x,pos_y,0,0,80,80);
-										x++;
+								}																		
+								snprintf(affichage,50,"Images/image%d.png",(tab[x]+1));
+								ChargerImage(affichage,pos_x,pos_y,0,0,80,80);
+								x++;
 						}
 					}
 					if(ToucheEnAttente() && Touche(XK_t)){
@@ -86,23 +79,17 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){
 								if (tab[x]==-1){
 									pos_x=650;
 									pos_y=1000;
-									}
-									if (position[tab[x]][0]==0){
-										position[tab[x]][0]=pos_x;
-										position[tab[x]][1]=pos_y;
-										}
-										else{
-											position[tab[x]][2]=pos_x;
-											position[tab[x]][3]=pos_y;
-											}
-											ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80);
-											x++;
+								}									
+								ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80);
+								x++;
 							}
 						}
 						n=1;
 					}
 				}
 			}
+
+			/*Clic de la souris*/
 			if (SourisCliquee()){
 				clic_x=_X;
 				clic_y=_Y;
@@ -110,10 +97,17 @@ int jeu(int position[20][4], int nb_paires,int tab[40]){
 				im_x=0;
 				im_y=0;
 			
+				/*Détection des coordonées x et y du clic de la souris*/
 				for (pos_y=370;pos_y>=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){