diff --git a/src/main.c b/src/main.c index 68e372a..64c6c77 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ */ /* +#+ */ /* Created: 2025/04/15 16:01:29 by qmennen #+# #+# */ -/* Updated: 2025/04/20 14:25:22 by whaffman ######## odam.nl */ +/* Updated: 2025/04/22 16:06:53 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -38,6 +38,7 @@ int main(int argc, char **argv) if (!init_game(&game, argc, argv)) { ft_putstr_fd("Error initializing game\n", 2); + free_game(&game); return (EXIT_FAILURE); } mlx_loop(game->screen->mlx); diff --git a/src/map.c b/src/map.c index ba56915..647843b 100644 --- a/src/map.c +++ b/src/map.c @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/04/22 13:20:51 by whaffman #+# #+# */ -/* Updated: 2025/04/22 15:43:35 by whaffman ######## odam.nl */ +/* Updated: 2025/04/22 16:09:18 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -38,20 +38,6 @@ void print_map(t_map *map) } } -void free_map(t_map **map) -{ - if (!map || !*map) - return ; - int i = 0; - while (i < (*map)->height) - { - free((*map)->grid[i]); - i++; - } - free((*map)->grid); - free(*map); - *map = NULL; -} int find_player_or_empty(t_map *map, int *x, int *y) { @@ -226,6 +212,7 @@ int map_create(t_game **game, int argc, char **argv) if(!enclosed_map(map)) { fprintf(stderr, "NOT GOOD MAP FRIEND\n"); + grid_free(grid, map->height); map_free(map); return (FAILURE); } diff --git a/test.cub b/test.cub index 3642e9a..6a1b216 100644 --- a/test.cub +++ b/test.cub @@ -16,12 +16,21 @@ F 200,200,200 C 100,100,10 -11111111111 -10000000001 -10000001011 -1E000001011 -1110000101 - 10000001 111 - 100000011101 - 100000000001 - 111111111111 \ No newline at end of file + +1111111 111 1111 111111 1111111111 111111 +1000001110111001 100001 w 1000001001 10001 +1000000000000001 100001 100000110111100011 +1000001110000001110011111111 110000001000000001 +1000001 10001000000010000001 100000001000000001 +1000001110001000000000000001111100000001000000001 +1000000000001111111111100000000000111111000000001 +1000000000001 1000011111111 1000001001 +1000011111001 100001 1111111001 +100001 1001 1000011111111 1001 +111111 1001 1000000000001 1001 + 1001 1111111111111 1001 + 1001 1001 + 1001 1001 + 1001111111111111111111111111111111111001 + 1000000000000000000000000000000000000001 + 1111111111111111111111111111111111111111 \ No newline at end of file