diff options
| author | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-17 16:25:11 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-17 16:25:11 +0100 |
| commit | 4f207400fd8e6724d321b6f2fa79fba5f16f9d59 (patch) | |
| tree | 3896037d8a5938044bd6b6d49a18ad6305b948f0 /inc | |
| parent | Added libbsd to linux Makefile (diff) | |
| parent | ready to merge (diff) | |
| download | 42-cub3d-4f207400fd8e6724d321b6f2fa79fba5f16f9d59.tar.gz 42-cub3d-4f207400fd8e6724d321b6f2fa79fba5f16f9d59.tar.bz2 42-cub3d-4f207400fd8e6724d321b6f2fa79fba5f16f9d59.tar.xz 42-cub3d-4f207400fd8e6724d321b6f2fa79fba5f16f9d59.tar.zst 42-cub3d-4f207400fd8e6724d321b6f2fa79fba5f16f9d59.zip | |
Merge branch 'better_parse'
Diffstat (limited to '')
| -rw-r--r-- | inc/cub3d.h | 4 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 38 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 5 |
3 files changed, 41 insertions, 6 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..0c9a294 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 @@ -42,7 +54,29 @@ # endif /* -** ====== ERROR MSG ====== +** ====== MAP ERROR MSG ====== +*/ + +# define FT_ERR_ALLOCATE "allocation error" +# define FT_ERR_READ "read error" +# define FT_ERR_NOT_A_CUB "given map is not a .cub" +# define FT_ERR_ARGS "too many or to few arguments" +# define FT_ERR_RES_SMALL "resolution is too small" +# define FT_ERR_RES_ALPHA "resolution should be digits only" +# define FT_ERR_NOT_A_XPM "given texture is not a .xpm" +# define FT_ERR_COLOR_ALPHA "colors should be digits only" +# define FT_ERR_COLOR_MAX "colors should be maximum 255" +# define FT_ERR_COLOR_ARGS "colors three numbers separated by commas" +# define FT_ERR_UNFINISHED "no map" +# define FT_ERR_MAP_LEN "map length inconsistency" +# define FT_ERR_ILL_ENTRY "illegal map entry" +# define FT_ERR_ALR_SET "duplicate entry" +# define FT_ERR_ILL_MAP "map contains illegal char" +# define FT_ERR_MULT_SPAWN "multiple spawn points" +# define FT_ERR_MAP_L_L "last line is invalid" + +/* +** ====== MISSING ERROR MSG ====== */ # define FT_ERR_MISS_ELEMENT "Missing element:" @@ -53,7 +87,7 @@ # define FT_ERR_MISS_SPRITE "sprite texture" # define FT_ERR_MISS_RESOLUTION "resolution" # define FT_ERR_MISS_FLOOR_C "floor color" -# define FT_ERR_MISS_CEIL_C "floor color" +# define FT_ERR_MISS_CEIL_C "ceiling color" # define FT_ERR_MISS_PLAYER_SPAWN "player spawn" # endif diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 1bf2bca..2f032e0 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -23,8 +23,8 @@ typedef struct s_win uint8_t inited; uint16_t x_max_size; uint16_t y_max_size; - uint16_t x_size; - uint16_t y_size; + uint32_t x_size; + uint32_t y_size; } t_win; typedef struct s_img @@ -109,6 +109,7 @@ typedef struct s_map typedef struct s_cub { uint8_t minimap; + char errmsg[40]; struct s_win *wlist; struct s_player *plist; struct s_map *mlist; |