Merge branch 'submission' of github.com:SirAlabar/cub3D into submission

MarkosComK · MarkosComK · commit 1c3f4229426e · 2025-04-12T16:03:45.000+01:00
diff --git a/bonus/srcs/checker/checker.c b/bonus/srcs/checker/checker.c
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   checker.c                                          :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: marsoare <marsoare@student.42porto.com>    +#+  +:+       +#+        */
+/*   By: hluiz-ma <hluiz-ma@student.42porto.com>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/06 19:45:38 by marsoare          #+#    #+#             */
-/*   Updated: 2025/01/12 14:20:40 by marsoare         ###   ########.fr       */
+/*   Updated: 2025/04/12 15:44:51 by hluiz-ma         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -68,6 +68,14 @@ bool	check_colors(t_game *game)
 bool	checker(t_game *game, char *path)
 {
 	game->map_path = path;
+	game->map.grid = NULL;
+	game->map.width = 0;
+	game->map.height = 0;
+	game->map.floor_color = 9134906;
+	game->map.ceiling_color = 11272191;
+	game->map.player_start = '\0';
+	game->map.player_pos = vector_create(0, 0);
+	init_colors(game);
 	if (!check_colors(game))
 		return (cleanup_game(game), false);
 	return (true);
diff --git a/bonus/srcs/initializer/init_colors.c b/bonus/srcs/initializer/init_colors.c
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   init_colors.c                                      :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: marsoare <marsoare@student.42porto.com>    +#+  +:+       +#+        */
+/*   By: hluiz-ma <hluiz-ma@student.42porto.com>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/08 18:10:02 by marsoare          #+#    #+#             */
-/*   Updated: 2025/01/11 19:08:10 by marsoare         ###   ########.fr       */
+/*   Updated: 2025/04/12 15:48:24 by hluiz-ma         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -62,8 +62,7 @@ void	assign_color(t_game *game, char *line)
 		color = rgb_to_hex(line);
 		if (color == -1)
 		{
-			ft_putendl_fd("Error\nfloor)", 2);
-			get_number(42);
+			handle_color_error(game, "Error\nInvalid floor color");
 		}
 		game->map.floor_color = color;
 	}
@@ -72,8 +71,7 @@ void	assign_color(t_game *game, char *line)
 		color = rgb_to_hex(line);
 		if (color == -1)
 		{
-			ft_putendl_fd("Error\nceiling", 2);
-			get_number(42);
+			handle_color_error(game, "Error\nInvalid ceiling color");
 		}
 		game->map.ceiling_color = color;
 	}
diff --git a/bonus/srcs/initializer/init_colors2.c b/bonus/srcs/initializer/init_colors2.c
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   init_colors2.c                                     :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: marsoare <marsoare@student.42porto.com>    +#+  +:+       +#+        */
+/*   By: hluiz-ma <hluiz-ma@student.42porto.com>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/11 19:03:17 by marsoare          #+#    #+#             */
-/*   Updated: 2025/01/11 19:06:16 by marsoare         ###   ########.fr       */
+/*   Updated: 2025/04/12 15:30:18 by hluiz-ma         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -38,3 +38,10 @@ void	norm_norm(t_game *game, char *line, char **c, char **f)
 		assign_color(game, line);
 	}
 }
+
+void	handle_color_error(t_game *game, char *message)
+{
+	ft_putendl_fd(message, 2);
+	cleanup_game(game);
+	exit(1);
+}
diff --git a/bonus/srcs/main.c b/bonus/srcs/main.c
@@ -6,7 +6,7 @@
 /*   By: hluiz-ma <hluiz-ma@student.42porto.com>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/29 16:37:53 by marsoare          #+#    #+#             */
-/*   Updated: 2025/03/24 19:13:09 by hluiz-ma         ###   ########.fr       */
+/*   Updated: 2025/04/12 15:48:45 by hluiz-ma         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/includes_bonus/cub3d.h b/includes_bonus/cub3d.h
@@ -6,7 +6,7 @@
 /*   By: hluiz-ma <hluiz-ma@student.42porto.com>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/11 13:49:34 by hluiz-ma          #+#    #+#             */
-/*   Updated: 2025/03/22 15:08:09 by hluiz-ma         ###   ########.fr       */
+/*   Updated: 2025/04/12 15:32:09 by hluiz-ma         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -212,6 +212,7 @@ void			assign_color(t_game *game, char *line);
 int				get_number(int flag);
 void			norm_norm(t_game *game, char *line, char **c, char **f);
 int				rgb_to_hex(char *color);
+void			handle_color_error(t_game *game, char *message);
 //initialize/init_map.c
 void			init_map(t_game *game);
 char			**read_map(t_game *game);
diff --git a/mandatory/src/initializer/init_colors.c b/mandatory/src/initializer/init_colors.c
@@ -6,7 +6,7 @@
 /*   By: hluiz-ma <hluiz-ma@student.42porto.com>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/08 18:10:02 by marsoare          #+#    #+#             */
-/*   Updated: 2025/04/07 20:29:00 by hluiz-ma         ###   ########.fr       */
+/*   Updated: 2025/04/12 15:47:11 by hluiz-ma         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -60,8 +60,9 @@ void	assign_color(t_game *game, char *line)
 		color = rgb_to_hex(line);
 		if (color == -1)
 		{
-			ft_putendl_fd("Error\nfloor)", 2);
-			get_number(42);
+			ft_putendl_fd("Error\nInvalid floor color", 2);
+			cleanup_game(game);
+			exit(1);
 		}
 		game->map.floor_color = color;
 	}
@@ -70,8 +71,9 @@ void	assign_color(t_game *game, char *line)
 		color = rgb_to_hex(line);
 		if (color == -1)
 		{
-			ft_putendl_fd("Error\nceiling", 2);
-			get_number(42);
+			ft_putendl_fd("Error\nInvalid ceiling color", 2);
+			cleanup_game(game);
+			exit(1);
 		}
 		game->map.ceiling_color = color;
 	}

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,10 @@`
`3`	`3`	`/* ::: :::::::: */`
`4`	`4`	`/* init_colors.c :+: :+: :+: */`
`5`	`5`	`/* +:+ +:+ +:+ */`
`6`		`-/* By: marsoare <marsoare@student.42porto.com> +#+ +:+ +#+ */`
	`6`	`+/* By: hluiz-ma <hluiz-ma@student.42porto.com> +#+ +:+ +#+ */`
`7`	`7`	`/* +#+#+#+#+#+ +#+ */`
`8`	`8`	`/* Created: 2025/01/08 18:10:02 by marsoare #+# #+# */`
`9`		`-/* Updated: 2025/01/11 19:08:10 by marsoare ### ########.fr */`
	`9`	`+/* Updated: 2025/04/12 15:48:24 by hluiz-ma ### ########.fr */`
`10`	`10`	`/* */`
`11`	`11`	`/* ************************************************************************** */`
`12`	`12`
`@@ -62,8 +62,7 @@ void assign_color(t_game game, char line)`
`62`	`62`	`color = rgb_to_hex(line);`
`63`	`63`	`if (color == -1)`
`64`	`64`	`{`
`65`		`- ft_putendl_fd("Error\nfloor)", 2);`
`66`		`- get_number(42);`
	`65`	`+ handle_color_error(game, "Error\nInvalid floor color");`
`67`	`66`	`}`
`68`	`67`	`game->map.floor_color = color;`
`69`	`68`	`}`
`@@ -72,8 +71,7 @@ void assign_color(t_game game, char line)`
`72`	`71`	`color = rgb_to_hex(line);`
`73`	`72`	`if (color == -1)`
`74`	`73`	`{`
`75`		`- ft_putendl_fd("Error\nceiling", 2);`
`76`		`- get_number(42);`
	`74`	`+ handle_color_error(game, "Error\nInvalid ceiling color");`
`77`	`75`	`}`
`78`	`76`	`game->map.ceiling_color = color;`
`79`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`/* By: hluiz-ma <hluiz-ma@student.42porto.com> +#+ +:+ +#+ */`
`7`	`7`	`/* +#+#+#+#+#+ +#+ */`
`8`	`8`	`/* Created: 2025/01/08 18:10:02 by marsoare #+# #+# */`
`9`		`-/* Updated: 2025/04/07 20:29:00 by hluiz-ma ### ########.fr */`
	`9`	`+/* Updated: 2025/04/12 15:47:11 by hluiz-ma ### ########.fr */`
`10`	`10`	`/* */`
`11`	`11`	`/* ************************************************************************** */`
`12`	`12`
`@@ -60,8 +60,9 @@ void assign_color(t_game game, char line)`
`60`	`60`	`color = rgb_to_hex(line);`
`61`	`61`	`if (color == -1)`
`62`	`62`	`{`
`63`		`- ft_putendl_fd("Error\nfloor)", 2);`
`64`		`- get_number(42);`
	`63`	`+ ft_putendl_fd("Error\nInvalid floor color", 2);`
	`64`	`+ cleanup_game(game);`
	`65`	`+ exit(1);`
`65`	`66`	`}`
`66`	`67`	`game->map.floor_color = color;`
`67`	`68`	`}`
`@@ -70,8 +71,9 @@ void assign_color(t_game game, char line)`
`70`	`71`	`color = rgb_to_hex(line);`
`71`	`72`	`if (color == -1)`
`72`	`73`	`{`
`73`		`- ft_putendl_fd("Error\nceiling", 2);`
`74`		`- get_number(42);`
	`74`	`+ ft_putendl_fd("Error\nInvalid ceiling color", 2);`
	`75`	`+ cleanup_game(game);`
	`76`	`+ exit(1);`
`75`	`77`	`}`
`76`	`78`	`game->map.ceiling_color = color;`
`77`	`79`	`}`