diff options
Diffstat (limited to 'parse')
| -rw-r--r-- | parse/parse.c | 4 | ||||
| -rw-r--r-- | parse/parse_ceilling_color.c | 11 | ||||
| -rw-r--r-- | parse/parse_floor_color.c | 11 |
3 files changed, 17 insertions, 9 deletions
diff --git a/parse/parse.c b/parse/parse.c index f543ca5..8f3124d 100644 --- a/parse/parse.c +++ b/parse/parse.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/15 09:29:21 by cacharle #+# #+# */ -/* Updated: 2019/11/15 09:32:54 by cacharle ### ########.fr */ +/* Updated: 2019/11/18 17:21:38 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,6 +23,8 @@ t_parsing *parse(char *filename) if ((parsing = (t_parsing*)malloc(sizeof(t_parsing))) == NULL) return (NULL); parsing->map = NULL; + parsing->ceilling_color.hexcode = 0; + parsing->floor_color.hexcode = 0; i = -1; while (lines[++i] != NULL) { diff --git a/parse/parse_ceilling_color.c b/parse/parse_ceilling_color.c index a451f94..3b6c334 100644 --- a/parse/parse_ceilling_color.c +++ b/parse/parse_ceilling_color.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/15 09:31:32 by cacharle #+# #+# */ -/* Updated: 2019/11/18 02:43:46 by cacharle ### ########.fr */ +/* Updated: 2019/11/18 17:22:49 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,10 +15,13 @@ t_bool parse_ceilling_color(t_parsing *parsing, char *line) { line++; - parsing->ceilling_color.rgb.r = ft_atoi(line); + if ((parsing->ceilling_color.rgb.r = ft_atoi(line)) > 255) + return (FALSE); line = ft_strchr(line, ',') + 1; - parsing->ceilling_color.rgb.g = ft_atoi(line); + if ((parsing->ceilling_color.rgb.g = ft_atoi(line)) > 255) + return (FALSE); line = ft_strchr(line, ',') + 1; - parsing->ceilling_color.rgb.b = ft_atoi(line); + if ((parsing->ceilling_color.rgb.b = ft_atoi(line)) > 255) + return (FALSE); return (TRUE); } diff --git a/parse/parse_floor_color.c b/parse/parse_floor_color.c index 3885586..ab16bd9 100644 --- a/parse/parse_floor_color.c +++ b/parse/parse_floor_color.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/15 09:29:32 by cacharle #+# #+# */ -/* Updated: 2019/11/18 02:43:36 by cacharle ### ########.fr */ +/* Updated: 2019/11/18 17:23:26 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,10 +15,13 @@ t_bool parse_floor_color(t_parsing *parsing, char *line) { line++; - parsing->floor_color.rgb.r = ft_atoi(line); + if ((parsing->floor_color.rgb.r = ft_atoi(line)) > 255) + return (FALSE); line = ft_strchr(line, ',') + 1; - parsing->floor_color.rgb.g = ft_atoi(line); + if ((parsing->floor_color.rgb.g = ft_atoi(line)) > 255) + return (FALSE); line = ft_strchr(line, ',') + 1; - parsing->floor_color.rgb.b = ft_atoi(line); + if ((parsing->floor_color.rgb.b = ft_atoi(line)) > 255) + return (FALSE); return (TRUE); } |