diff options
| author | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-03-12 18:56:59 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-03-12 18:56:59 +0100 |
| commit | 141fb4d33f73cac99b1b19e475f83fb755f208a2 (patch) | |
| tree | e93c2d490440caee29f2c85d86c9dc9bd8512a28 /inc | |
| parent | kk (diff) | |
| download | 42-cub3d-141fb4d33f73cac99b1b19e475f83fb755f208a2.tar.gz 42-cub3d-141fb4d33f73cac99b1b19e475f83fb755f208a2.tar.bz2 42-cub3d-141fb4d33f73cac99b1b19e475f83fb755f208a2.tar.xz 42-cub3d-141fb4d33f73cac99b1b19e475f83fb755f208a2.tar.zst 42-cub3d-141fb4d33f73cac99b1b19e475f83fb755f208a2.zip | |
good
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 3 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 2 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 56736ac..c08a994 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -151,7 +151,8 @@ void ft_music_fork(char **mcmd_words, char *const envp[]); int8_t ft_save_to_bmp(t_cub *cl); int ft_error(uint8_t retval, const char *errmsg, t_cub *clist); uint8_t ft_free_words(char **words); -int8_t ft_warp_level(t_cub *cl); +uint8_t ft_free_sprites(char **sprites); +int8_t ft_warp_level(char *path, t_cub *cl); int ft_exit(uint8_t exit_code, t_cub *clist); uint32_t ft_rgb_to_hex(t_rgb rgb); t_bmp_rgb ft_hex_to_rgb(uint32_t color); diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index bda46fe..b9a82c7 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -115,7 +115,7 @@ enum */ # define FT_CHRST_VALID_PARSE "RNSEWFCLMT" -# define FT_CHRST_MAP_ENTRY "01234NSEWLT " +# define FT_CHRST_MAP_ENTRY "0123456789NSEWLT " # define FT_CHRST_SPAWN "NSEW" # define FT_CHRST_MAP_NON_WALL "02NESWLT" # define FT_CHRST_COLLISION "123456789 " diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 122ce16..d0e0845 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -165,7 +165,6 @@ typedef struct s_map char *so_tex_path; char *ea_tex_path; char *we_tex_path; - char **sprite_path; char *nl_tex_path; char *fl_tex_path; char *ce_tex_path; @@ -175,6 +174,7 @@ typedef struct s_map char *music_path; char *music_cmd; char *mapl; + char **sprite_path; char **map; char **mcmd_words; int8_t x_step; |