diff options
| author | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-15 18:51:30 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-15 18:51:30 +0100 |
| commit | fbc52949004a067a5c2cfefae1ff3415dbe04a96 (patch) | |
| tree | a887e3657e6abd384d729f51c42a2ac4c0869c77 /inc | |
| parent | Merged (diff) | |
| download | 42-cub3d-fbc52949004a067a5c2cfefae1ff3415dbe04a96.tar.gz 42-cub3d-fbc52949004a067a5c2cfefae1ff3415dbe04a96.tar.bz2 42-cub3d-fbc52949004a067a5c2cfefae1ff3415dbe04a96.tar.xz 42-cub3d-fbc52949004a067a5c2cfefae1ff3415dbe04a96.tar.zst 42-cub3d-fbc52949004a067a5c2cfefae1ff3415dbe04a96.zip | |
In progress
Diffstat (limited to '')
| -rw-r--r-- | inc/cub3d.h | 4 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 18 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 1 |
3 files changed, 21 insertions, 2 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 386f658..55c7a97 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -25,7 +25,6 @@ ** 3: failed mlx init ** 4: map error ** 5: no map -** 6: not a .cub */ int8_t ft_init_cub3d(t_cub **clist); @@ -55,7 +54,7 @@ int8_t ft_check_map_line(char *line, uint8_t l, t_cub *clist); size_t ft_get_line_len(char *line); int ft_missing_error(const char *err, t_cub *clist); uint8_t ft_free_words(char **words); -int ft_map_error(t_cub *clist); +int ft_map_error(const char *errmsg, t_cub *clist); int ft_init_winlx(t_cub *clist); void ft_draw_scene(t_cub *clist); void ft_print_list(t_cub *clist); @@ -73,5 +72,6 @@ int ft_d_key(t_cub *clist); int ft_f1_key(t_cub *clist); int ft_left_key(t_cub *clist); int ft_right_key(t_cub *clist); +int8_t ft_check_ext(const char *filep, const char *ext); # endif diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index e6c98c5..6f8de65 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -1,3 +1,15 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* cub3d_defines.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rbousset <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/15 15:40:25 by rbousset #+# #+# */ +/* Updated: 2020/02/15 15:40:27 by rbousset ### ########lyon.fr */ +/* */ +/* ************************************************************************** */ + # ifndef CUB3D_DEFINES_H # define CUB3D_DEFINES_H @@ -45,6 +57,12 @@ ** ====== ERROR MSG ====== */ +# define FT_ERR_NOT_A_CUB "given map is not a .cub" +# define FT_ERR_MAP_L_L "last line is invalid or contains illegal char" +# define FT_ERR_UNFINISHED "unexpected file end" +# define FT_ERR_READ "read error" +# define FT_ERR_ILL_ENTRY "illegal map entry" +# define FT_ERR_ALR_SET "duplicate entry" # define FT_ERR_MISS_ELEMENT "Missing element:" # define FT_ERR_MISS_NORTH "north side texture" # define FT_ERR_MISS_SOUTH "south side texture" diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 1bf2bca..fce155e 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -109,6 +109,7 @@ typedef struct s_map typedef struct s_cub { uint8_t minimap; + char *errmsg; struct s_win *wlist; struct s_player *plist; struct s_map *mlist; |