diff --git a/srcs/get_texture_array.c b/srcs/get_texture_array.c index 8272ad2..ac858ac 100644 --- a/srcs/get_texture_array.c +++ b/srcs/get_texture_array.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/05/06 16:10:11 by apommier #+# #+# */ -/* Updated: 2022/06/15 14:23:32 by apommier ### ########.fr */ +/* Updated: 2022/06/15 14:36:04 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -40,11 +40,6 @@ void put_texture_in_struct(char type, unsigned char *texture, t_data *img) } } -int verify_texture() -{ - -} - int is_nbr(char *str) { int i; diff --git a/srcs/parsing/parse_map.c b/srcs/parsing/parse_map.c index 883c156..072f0b5 100644 --- a/srcs/parsing/parse_map.c +++ b/srcs/parsing/parse_map.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* parse_map.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: sadjigui +#+ +:+ +#+ */ +/* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/05/10 17:54:25 by sadjigui #+# #+# */ -/* Updated: 2022/06/14 16:32:34 by sadjigui ### ########.fr */ +/* Updated: 2022/06/15 14:35:05 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -269,6 +269,7 @@ char **isafile(char **av, t_data *img) img->err = 0; fd = open(av[1], O_RDONLY); + img->to_be_free.fd_one = fd; str = NULL; tmp = NULL; if (fd == - 1) @@ -283,29 +284,32 @@ char **isafile(char **av, t_data *img) img->err = 2; } tmp = ft_strjoin(str, line); - if (str != NULL) - free(str); - str = tmp; - //size_line(line, img); free(line); line = NULL; + if (str != NULL) + free(str); + if (!tmp) + quit_game(img); + str = tmp; } if (img->err == 2) { - // free(line); free(str); ft_exit("Error\nBad texture file\n"); } split = ft_split(str, '\n'); + img->to_be_free.one_tab = split; free(str); free(line); close(fd); + img->to_be_free.fd_one = -1; int pass = 0; pass = check_texture_color(split, img); check_zero_one(split + pass, img); //leaks here transform_map(split + pass, img); free_double(split); + img->to_be_free.one_tab = 0; return (0); }