From b0605c841a9ff6f8ba0f3e3cca6ea6055dbfa809 Mon Sep 17 00:00:00 2001
From: proal <mathieu.proal@gmail.com>
Date: Tue, 29 Nov 2022 17:27:10 +0100
Subject: [PATCH] =?UTF-8?q?on=20r=C3=A9pare=20quelques=20trucs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images.c | 46 ++++++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/images.c b/images.c
index 534dac3..d585e99 100644
--- a/images.c
+++ b/images.c
@@ -20,20 +20,20 @@ int main(void){
 	
 	/*Initialisation des tableaux*/
 	for (i=0;i<20;i++){
-		for (j=0;j<2;j++){
+		for (j=0;j<4;j++){
 			positions[i][j]=0;
 		}
 	}
 	for (i=0;i<40;i++){
-		tab[i]=0;
+		tab[i]=-1;
 	}
 	
 	/*Tirage des images*/
 	srand(time(NULL));
 	for (i=0;i<2;i++){	
-		for (j=0;j<nb_paires+1;j++){
+		for (j=0;j<nb_paires;j++){
 			nb=rand()%(nb_paires*2);
-			if (tab[nb]!=0){
+			if (tab[nb]!=-1){
 				j--;
 			}
 			else{
@@ -41,17 +41,17 @@ int main(void){
 			}
 		}
 	}
-	
+	printf("toto\n");
 	
 	/*Affichage des images*/
 	srand(time(NULL));
 	i=0;
 	for (pos_y=10;pos_y<380;pos_y=pos_y+90){
 		for (pos_x=10;pos_x<650;pos_x=pos_x+90){
-			if (tab[i]==0){
+			/*if (tab[i]==-1){
 				pos_y=1000;
-			}
-			if (positions[tab[i]][0]==0){
+			}*/
+			 if (positions[tab[i]][0]==0){
 				positions[tab[i]][0]=pos_x;
 				positions[tab[i]][1]=pos_y;
 			}
@@ -60,28 +60,18 @@ int main(void){
 				positions[tab[i]][3]=pos_y;
 			}
 			/*Triche*/
-			snprintf(tirage,50,"Images/image%d.png",tab[i]);
+			snprintf(tirage,50,"Images/image%d.png",(tab[i]+1));
 			ChargerImage(tirage,pos_x,pos_y,0,0,80,80);
-			i++;
 			
-			//ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80);
+			///ChargerImage("Images/image0.png",pos_x,pos_y,0,0,80,80);
+			
+			i++;
 		}
 	}
 	
-	/*for (i=0;i<20;i++){
-		printf("%03d", i);
-		printf("   ");
-	}
-	printf("\n");
-	for (j=0;j<4;j++){
-		for (i=0;i<20;i++){
-			printf("%03d", positions[i][j]);
-			printf("   ");
-		}
-		printf("\n");
-	}*/
-	/*while(score==20){*/
-		while (SourisCliquee()==0){
+	while(score<=20){
+		if (SourisCliquee()){
+			SourisPosition();
 			clic_x=_X;
 			clic_y=_Y;
 		}
@@ -89,7 +79,7 @@ int main(void){
 			
 		for (pos_y=380;pos_y>10;pos_y=pos_y-90){
 			if (clic_y>=pos_y){
-				if (clic_y<=pos_y+90){
+				if (clic_y<=pos_y+80){
 					im_y=pos_y;
 					pos_y=0;
 				}
@@ -97,7 +87,7 @@ int main(void){
 		}
 		for (pos_x=650;pos_x>10;pos_x=pos_x-90){
 			if (clic_x>=pos_x){
-				if (clic_x<=pos_x+90){
+				if (clic_x<=pos_x+80){
 					im_x=pos_x;
 					pos_x=0;
 				}
@@ -115,7 +105,7 @@ int main(void){
 				}
 			}
 		}
-	/*}*/
+	}
 	Touche();
 	FermerGraphique();
 	printf("\n");