From 1f536a6c356bdb71b888fc9722d80172d899ec97 Mon Sep 17 00:00:00 2001
From: proal <mathieu.proal@gmail.com>
Date: Mon, 28 Nov 2022 18:34:21 +0100
Subject: [PATCH] le tirage aleatoire fonctionne

---
 action.c |  6 +++++-
 images.c | 41 ++++++++++++++++++++++++++++++++++-------
 images.h |  2 +-
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/action.c b/action.c
index 693fa94..cc03c64 100644
--- a/action.c
+++ b/action.c
@@ -3,5 +3,9 @@
 #include <graph.h>
 #include <time.h>
 #include "images.h"
+#include "action.h"
 
-int main(void){
\ No newline at end of file
+int main(void){
+	tirage_aleatoire();
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/images.c b/images.c
index e04c9f6..8ee1c0e 100644
--- a/images.c
+++ b/images.c
@@ -4,26 +4,30 @@
 #include <time.h>
 #include "images.h"
 
-int tirage_aleatoire(void){
+int main(void){
 	InitialiserGraphique();
 	ChoisirEcran(0);
     CreerFenetre(0,0,1024,576);
 	char tirage[50];
-	int pos_x, pos_y;
+	int pos_x, pos_y, clic_x, clic_y, spr, spr2;
 	int i, j;
 	int nb;
 	int tab[40];
-	int nb_paires;
-	
-	printf("Combien de paires ? --> ");
-	scanf("%d", &nb_paires);
+	int nb_paires=20;
+	int positions[20][4];
 	
 	ChargerImage("Images/background.png",0,0,0,0,1024,576);
 	
+	/*Initialisation des tableaux*/
+	for (i=0;i<20;i++){
+		for (j=0;j<2;j++){
+			positions[i][j]=0;
+	}
 	for (i=0;i<40;i++){
 		tab[i]=0;
 	}
 	
+	/*Tirage des images*/
 	srand(time(NULL));
 	for (i=0;i<2;i++){	
 		for (j=0;j<nb_paires+1;j++){
@@ -38,7 +42,7 @@ int tirage_aleatoire(void){
 	}
 	
 	
-	/*Tirage des images*/
+	/*Affichage des images*/
 	srand(time(NULL));
 	i=0;
 	for (pos_y=10;pos_y<380;pos_y=pos_y+90){
@@ -46,17 +50,40 @@ int tirage_aleatoire(void){
 			if (tab[i]==0){
 				pos_y=1000;
 			}
+			if (positions[tab[i]][0]==0){
+				positions[tab[i]][0]=pos_x;
+				positions[tab[i]][1]=pos_y;
+			}
+			else{
+				positions[tab[i]][2]=pos_x;
+				positions[tab[i]][3]=pos_y;
+			}
 			snprintf(tirage,50,"Images/image%d.png",tab[i]);
 			ChargerImage(tirage,pos_x,pos_y,0,0,80,80);
 			i++;
 		}
 	}	
 	
+	/*SourisCliquee();
+	clic_x=_X;
+	clic_y=_Y;*/
+		
+	spr = ChargerSprite("Images/image0.png");
+	AfficherSprite(spr, 10, 10);
+	Touche();
+	LibererSprite(spr);
+		
+	spr2= ChargerSprite("Images/image0.png");
+	AfficherSprite(spr, 100, 100);
+	Touche();
+	printf("%d", spr2);
+	
 	Touche();
 	FermerGraphique();
 	printf("\n");
 	return EXIT_SUCCESS;
 }
+}
 
 
 
diff --git a/images.h b/images.h
index b6f98da..5a598cc 100644
--- a/images.h
+++ b/images.h
@@ -1,6 +1,6 @@
 #ifndef IMAGES_H
 #define IMAGES_H
 
-void chargement(void);
+int tirage_aleatoire(void);
 
 #endif
\ No newline at end of file