From 770efb9b83447eab7c985b355d5302a815a65d0c Mon Sep 17 00:00:00 2001 From: Souidi Date: Thu, 1 Dec 2022 22:19:06 +0100 Subject: [PATCH] =?UTF-8?q?Correction=20de=20probl=C3=A8mes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/game.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/game.c b/src/game.c index 30c465b..3ccc681 100644 --- a/src/game.c +++ b/src/game.c @@ -18,14 +18,14 @@ typedef struct { card create_card(int x, int y, int L, int H, char *file) { card carte = {x, y, L, H, 0, 0, file}; - + DessinerRectangle(x, y, L, H); return carte; } int game(int colonnes, int lignes) { - int i,j, t, used, r; - int i, j, l, c, case_max_width, case_max_height, case_max_dimensions, case_margin, boucle; + int i, j, t, used, r, l, c, case_max_width, case_max_height, case_max_dimensions, case_margin, boucle; unsigned long int timer; + char *file = (char*)malloc(30 * sizeof(char)); size_t k, m; int* tab = malloc(sizeof(int) * (colonnes * lignes)); srand(time(NULL)); @@ -72,10 +72,17 @@ int game(int colonnes, int lignes) { case_margin = case_max_dimensions * 0.05; card cards[lignes][colonnes]; - + i=0; for (l = 0; l < lignes; l++) { for (c = 0; c < colonnes; c++) { - cards[l][c] = create_card(GAME_MARGIN_RIGHT + (c * case_max_dimensions), GAME_MARGIN_TOP + (l * case_max_dimensions), case_max_dimensions - (2 * case_margin), case_max_dimensions - (2 * case_margin)); + sprintf(file, "../img/cards/%dx%d/%d.png", colonnes, lignes, tab[i]); + cards[l][c] = create_card( + GAME_MARGIN_RIGHT + (c * case_max_dimensions), + GAME_MARGIN_TOP + (l * case_max_dimensions), + case_max_dimensions - (2 * case_margin), case_max_dimensions - (2 * case_margin), + file + ); + i++; } } timer = start_timer(0); @@ -86,4 +93,4 @@ int game(int colonnes, int lignes) { } return fin(timer); -}s \ No newline at end of file +} \ No newline at end of file