From aac63f08b5ebf467a60d19d876ea02f057107a34 Mon Sep 17 00:00:00 2001 From: antoinemeyer5 <antoine.meyer54@gmail.com> Date: Thu, 30 Jun 2022 09:49:10 +0200 Subject: [PATCH] clean map.c et map.h --- .../jeu_appren_par_renfo/src/map.c | 23 +++++++++++-------- .../jeu_appren_par_renfo/src/map.h | 2 -- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/travail_de_groupe/jeu_appren_par_renfo/src/map.c b/travail_de_groupe/jeu_appren_par_renfo/src/map.c index 97e1d63..ac66327 100644 --- a/travail_de_groupe/jeu_appren_par_renfo/src/map.c +++ b/travail_de_groupe/jeu_appren_par_renfo/src/map.c @@ -2,27 +2,32 @@ int map[MAP_HEIGHT][MAP_WIDTH]; - -void readMapFromFile(char *file_name){ +void readMapFromFile(char *file_name) +{ FILE *file = fopen(file_name, "r"); - if (file == NULL){ + if (file == NULL) + { printf("Couldn't open map file."); exit(EXIT_FAILURE); } int i, j; - for (i = 0; i < MAP_HEIGHT ; i++){ - for (j = 0; j < MAP_WIDTH; j++){ + for (i = 0; i < MAP_HEIGHT; i++) + { + for (j = 0; j < MAP_WIDTH; j++) + { fscanf(file, "%d", &map[i][j]); } } fclose(file); } - -void printMap(){ +void printMap() +{ int i, j; - for (i = 0; i < MAP_HEIGHT; i++){ - for (j = 0; j < MAP_WIDTH; j++){ + for (i = 0; i < MAP_HEIGHT; i++) + { + for (j = 0; j < MAP_WIDTH; j++) + { printf("%d ", map[i][j]); } printf("\n"); diff --git a/travail_de_groupe/jeu_appren_par_renfo/src/map.h b/travail_de_groupe/jeu_appren_par_renfo/src/map.h index 13c7cf8..2e1bb0c 100644 --- a/travail_de_groupe/jeu_appren_par_renfo/src/map.h +++ b/travail_de_groupe/jeu_appren_par_renfo/src/map.h @@ -3,11 +3,9 @@ #include "main.h" - #define MAP_WIDTH 31 #define MAP_HEIGHT 10 - extern int map[MAP_HEIGHT][MAP_WIDTH]; void readMapFromFile(char *file_name); -- GitLab