diff options
Diffstat (limited to 'inc')
-rw-r--r-- | inc/cub3d.h | 6 | ||||
-rw-r--r-- | inc/cub3d_structs.h | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index f7b1a22..2fefabe 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -29,7 +29,7 @@ int ft_init_winptr(t_cub *clist); t_ray ft_init_s_ray(void); t_rgb ft_init_rgb(void); int8_t ft_init_map(t_map *mlist); -t_bmp ft_init_bmp(void); +void ft_init_bmp(t_bmp_file *bmp_file); /* ** ====== HOOKS ====== @@ -121,8 +121,8 @@ void ft_set_minimap_scale(t_cub *clist); void *ft_music_thread(void *vargp); void ft_detect(t_cub *cl); void ft_castray(t_cub *cl); -int8_t ft_save_to_bmp(t_bmp bmp, void *img, t_cub *cl); -int ft_error(const char *errmsg, t_cub *clist); +int8_t ft_save_to_bmp(t_bmp_file *bmp_file, void *img, 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); int ft_exit(uint8_t exit_code, t_cub *clist); diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 19e211e..af39fdd 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -47,8 +47,13 @@ typedef struct s_bmp_info typedef struct s_bmp_colors { - -} t_bmp_color; + uint32_t red_mask; + uint32_t green_mask; + uint32_t blue_mask; + uint32_t alpha_mask; + uint32_t color_space_type; + uint32_t unused[16]; +} t_bmp_colors; typedef struct s_bmp_file { @@ -57,8 +62,9 @@ typedef struct s_bmp_file uint16_t reserv_one; uint16_t reserv_two; uint32_t offset_data; - struct s_bmp_info -} t_bmp_file_head; + struct s_bmp_info bmp_info; + struct s_bmp_colors bmp_colors; +} t_bmp_file; # pragma pack(pop) |