diff options
| -rw-r--r-- | inc/cub3d.h | 4 | ||||
| -rw-r--r-- | src/ft_get_map_redo.c | 4 | ||||
| -rw-r--r-- | src/ft_parse_map.c | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 01dcd76..40475eb 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -60,8 +60,8 @@ int ft_get_tex_we(char **words, t_cub *clist); int ft_get_sprite(char **words, t_cub *clist); int ft_get_f_color(char **words, t_cub *clist); int ft_get_c_color(char **words, t_cub *clist); -int ft_get_first_line(char *line, t_cub *clist); -int ft_get_map(int fd, t_cub *clist); +int ft_get_map_first_line(char *line, t_cub *clist); +int ft_get_map_core(int fd, t_cub *clist); int ft_check_missing(t_cub *clist); int ft_missing_error(const char *err, t_cub *clist); void ft_free_words(char **words); diff --git a/src/ft_get_map_redo.c b/src/ft_get_map_redo.c index 004dd3d..869f432 100644 --- a/src/ft_get_map_redo.c +++ b/src/ft_get_map_redo.c @@ -33,7 +33,7 @@ ft_check_line(char *line, uint8_t l, t_cub *clist) } int -ft_get_first_line(char *line, t_cub *clist) +ft_get_map_first_line(char *line, t_cub *clist) { if (!line[0]) { @@ -49,7 +49,7 @@ ft_get_first_line(char *line, t_cub *clist) } int -ft_get_map(int fd, t_cub *clist) +ft_get_map_core(int fd, t_cub *clist) { int ret; diff --git a/src/ft_parse_map.c b/src/ft_parse_map.c index af11e2f..f51d531 100644 --- a/src/ft_parse_map.c +++ b/src/ft_parse_map.c @@ -73,10 +73,9 @@ ft_parse_it(int fd, t_cub *clist) ft_memdel(line); return (ft_map_error(clist)); } - ft_printf("%s\n", line); if ((ret = ft_select_get(words, clist)) == 12) { - if (ft_get_first_line(line, clist) < 0) + if (ft_get_map_first_line(line, clist) < 0) return (-1); return (12); } @@ -104,7 +103,7 @@ ft_parse_map(const char *map_path, t_cub *clist) if (ret == -1) ft_map_error(clist); clist->nsew = 0; - if (ft_get_map(fd, clist) < 0) + if (ft_get_map_core(fd, clist) < 0) ft_map_error(clist); ft_check_missing(clist); /* if (ft_get_tex(fd, clist) < 0) */ |