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

Update error messages for map validation and config handling; improve code clarity

Browse Source
This commit is contained in:
whaffman 2025-06-10 20:45:07 +02:00
parent e023ba20b6
commit d337a5bd1a
5 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/cub3d.h
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/04/15 12:22:29 by qmennen #+# #+# */ /* Created: 2025/04/15 12:22:29 by qmennen #+# #+# */
/* Updated: 2025/06/10 19:36:23 by whaffman ######## odam.nl */ /* Updated: 2025/06/10 20:44:48 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -19,6 +19,7 @@
# define WIDTH 1920 # define WIDTH 1920
# define HEIGHT 1080 # define HEIGHT 1080
# define TITLE "Cub3D" # define TITLE "Cub3D"
# define ATTACK_DAMAGE 0.05f # define ATTACK_DAMAGE 0.05f
# define INITIAL_BATTERY 0.5f # define INITIAL_BATTERY 0.5f
# define BATTERY_RATE 0.01f # define BATTERY_RATE 0.01f

4
src/parser/map_create.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/04/23 12:21:13 by whaffman #+# #+# */ /* Created: 2025/04/23 12:21:13 by whaffman #+# #+# */
/* Updated: 2025/06/03 13:24:13 by whaffman ######## odam.nl */ /* Updated: 2025/06/10 20:34:23 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -55,7 +55,7 @@ static int map_validate_and_finalize(t_game **game, t_tile **grid)
{ {
if (!enclosed_map((*game)->map)) if (!enclosed_map((*game)->map))
{ {
ft_putendl_fd("Map is not enclosed", STDERR_FILENO); ft_putstr_fd("Error: Map is not enclosed\n", STDERR_FILENO);
grid_free(grid, (*game)->map->height); grid_free(grid, (*game)->map->height);
return (FAILURE); return (FAILURE);
} }

8
src/parser/parse_args.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/04/23 12:17:49 by whaffman #+# #+# */ /* Created: 2025/04/23 12:17:49 by whaffman #+# #+# */
/* Updated: 2025/04/25 11:36:47 by whaffman ######## odam.nl */ /* Updated: 2025/06/10 20:30:06 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -23,11 +23,7 @@ int parse_args(const char *mapfile, t_game *game)
return (FAILURE); return (FAILURE);
} }
if (!parse_file(buffer, game)) if (!parse_file(buffer, game))
{ return (free(buffer), FAILURE);
ft_putstr_fd("Error parsing map file\n", 2);
free(buffer);
return (FAILURE);
}
free(buffer); free(buffer);
return (SUCCESS); return (SUCCESS);
} }

17
src/parser/parse_config_line.c
View File

@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* :::::::: */
/* parse_config_line.c :+: :+: :+: */ /* parse_config_line.c :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+ */
/* Created: 2025/04/22 13:10:06 by whaffman #+# #+# */ /* Created: 2025/04/22 13:10:06 by whaffman #+# #+# */
/* Updated: 2025/06/10 15:47:23 by qmennen ### ########.fr */ /* Updated: 2025/06/10 20:33:42 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -61,7 +61,6 @@ int parse_config_line(char *line, t_map *map)
if (handler == NULL) if (handler == NULL)
return (ft_putstr_fd("Error: Invalid config token\n", 2), FAILURE); return (ft_putstr_fd("Error: Invalid config token\n", 2), FAILURE);
if (handler(token, map) == 0) if (handler(token, map) == 0)
return (ft_putstr_fd("Error: Failed to handle config token\n", 2), return (FAILURE);
FAILURE);
return (SUCCESS); return (SUCCESS);
} }

16
src/parser/parse_handlers.c
View File

@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* :::::::: */
/* parse_handlers.c :+: :+: :+: */ /* parse_handlers.c :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+ */
/* Created: 2025/06/03 14:38:12 by whaffman #+# #+# */ /* Created: 2025/06/03 14:38:12 by whaffman #+# #+# */
/* Updated: 2025/06/04 17:57:18 by qmennen ### ########.fr */ /* Updated: 2025/06/10 20:43:07 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -31,7 +31,7 @@ int handle_wall(char *token, t_map *map)
if (ft_strcmp(token, wall_tokens[i]) == 0) if (ft_strcmp(token, wall_tokens[i]) == 0)
{ {
if (map->textures[i] != NULL) if (map->textures[i] != NULL)
return (FAILURE); return (ft_putstr_fd("Error: Wall already set\n", 2), FAILURE);
map->textures[i] = load_texture(texture_path); map->textures[i] = load_texture(texture_path);
if (map->textures[i] == NULL) if (map->textures[i] == NULL)
return (FAILURE); return (FAILURE);