willem/cub3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

premerge commit

Browse Source
This commit is contained in:
whaffman 2025-04-23 11:53:50 +02:00
parent 93216e6f76
commit 4ae761f6a0
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/04/15 16:01:29 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)) if (!init_game(&game, argc, argv))
{ {
ft_putstr_fd("Error initializing game\n", 2); ft_putstr_fd("Error initializing game\n", 2);
free_game(&game);
return (EXIT_FAILURE); return (EXIT_FAILURE);
} }
mlx_loop(game->screen->mlx); mlx_loop(game->screen->mlx);

17
src/map.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/04/22 13:20:51 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) 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)) if(!enclosed_map(map))
{ {
fprintf(stderr, "NOT GOOD MAP FRIEND\n"); fprintf(stderr, "NOT GOOD MAP FRIEND\n");
grid_free(grid, map->height);
map_free(map); map_free(map);
return (FAILURE); return (FAILURE);
} }

27
test.cub
View File

@ -16,12 +16,21 @@ F 200,200,200
C 100,100,10 C 100,100,10
11111111111
10000000001 1111111 111 1111 111111 1111111111 111111
10000001011 1000001110111001 100001 w 1000001001 10001
1E000001011 1000000000000001 100001 100000110111100011
1110000101 1000001110000001110011111111 110000001000000001
10000001 111 1000001 10001000000010000001 100000001000000001
100000011101 1000001110001000000000000001111100000001000000001
100000000001 1000000000001111111111100000000000111111000000001
111111111111 1000000000001 1000011111111 1000001001
1000011111001 100001 1111111001
100001 1001 1000011111111 1001
111111 1001 1000000000001 1001
1001 1111111111111 1001
1001 1001
1001 1001
1001111111111111111111111111111111111001
1000000000000000000000000000000000000001
1111111111111111111111111111111111111111