Merge branch 'main' into Fine_tune3

Haliris · Sep 4, 2024 · 6d51bfa · 6d51bfa
2 parents e2a7bcc + 1e644e3
commit 6d51bfa
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 14 deletions.
diff --git a/includes/cub3d.h b/includes/cub3d.h
@@ -6,7 +6,7 @@
 /*   By: tsuchen <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/15 00:19:44 by tsuchen           #+#    #+#             */
-/*   Updated: 2024/09/04 13:50:33 by tsuchen          ###   ########.fr       */
+/*   Updated: 2024/09/04 13:57:10 by tsuchen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -140,6 +140,7 @@ typedef struct s_data
 }	t_data;
 
 int		cleanup(t_data *data);
+void	cleanup_textures(t_textdata *textures, void *mlx);
 int		game_init(t_data *data);
 int		key_events(int keycode, t_data *data);
 int		mouse_move(int x, int y, t_data *data);

diff --git a/includes/parser.h b/includes/parser.h
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   parser.h                                           :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: tsuchen <tsuchen@student.42.fr>            +#+  +:+       +#+        */
+/*   By: jteissie <jteissie@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/15 15:00:57 by jteissie          #+#    #+#             */
-/*   Updated: 2024/09/03 16:25:54 by tsuchen          ###   ########.fr       */
+/*   Updated: 2024/09/04 13:29:24 by jteissie         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,11 +29,11 @@ typedef enum e_texture
 
 typedef struct s_textdata
 {
-	void		*text_img[5];
-	int			tex_h[5];
-	int			tex_w[5];
-	char		*text_paths[5];
-	char		*text_addr[5];
+	void		*text_img[TEXTURES_PATHS];
+	int			tex_h[TEXTURES_PATHS];
+	int			tex_w[TEXTURES_PATHS];
+	char		*text_paths[TEXTURES_PATHS];
+	char		*text_addr[TEXTURES_PATHS];
 	int			floor;
 	int			ceiling;
 	int			textures_nb;

diff --git a/maps/bad_maps/start_on_edge.cub b/maps/bad_maps/start_on_edge.cub
@@ -0,0 +1,17 @@
+NO ./assets/made_wall_n.xpm
+SO ./assets/made_wall_s.xpm
+WE ./assets/made_wall_w.xpm
+EA ./assets/made_wall_e.xpm
+D ./assets/made_door.xpm
+
+F 64,     64,      64
+C 182,182,182
+
+1111111
+1000001
+1000001
+100N001
+1000001
+1111111
+1101    000001
+111111110011111
diff --git a/srcs/cleanup.c b/srcs/cleanup.c
@@ -3,16 +3,16 @@
 /*                                                        :::      ::::::::   */
 /*   cleanup.c                                          :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: tsuchen <tsuchen@student.42.fr>            +#+  +:+       +#+        */
+/*   By: jteissie <jteissie@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/27 17:04:32 by jteissie          #+#    #+#             */
-/*   Updated: 2024/09/03 17:36:22 by tsuchen          ###   ########.fr       */
+/*   Updated: 2024/09/04 13:17:57 by jteissie         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "cub3d.h"
 
-static void	cleanup_textures(t_textdata *textures, void *mlx)
+void	cleanup_textures(t_textdata *textures, void *mlx)
 {
 	if (textures->text_img[N])
 		mlx_destroy_image(mlx, textures->text_img[N]);

diff --git a/srcs/parser/get_textures_utils.c b/srcs/parser/get_textures_utils.c
@@ -6,7 +6,7 @@
 /*   By: tsuchen <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/28 17:29:47 by jteissie          #+#    #+#             */
-/*   Updated: 2024/09/04 13:49:02 by tsuchen          ###   ########.fr       */
+/*   Updated: 2024/09/04 13:59:11 by tsuchen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

diff --git a/srcs/parser/parser.c b/srcs/parser/parser.c
@@ -6,7 +6,7 @@
 /*   By: jteissie <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/15 12:12:00 by tsuchen           #+#    #+#             */
-/*   Updated: 2024/09/02 14:37:40 by jteissie         ###   ########.fr       */
+/*   Updated: 2024/09/04 13:18:57 by jteissie         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -102,10 +102,11 @@ int	parse_map(t_data *data)
 	data->map = build_map(data, line);
 	close(data->map_fd);
 	if (!data->map)
-		return (PANIC);
+		return (cleanup_textures(data->textures, data->mlx), PANIC);
 	if (verify_map(data->map, data) == MAP_ERR)
 	{
 		ft_putstr_fd("Error\n", STDERR_FILENO);
+		cleanup_textures(data->textures, data->mlx);
 		return (ft_free_all(data->map), PANIC);
 	}
 	return (SUCCESS);