diff options
| author | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 18:59:58 +0100 |
|---|---|---|
| committer | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 18:59:58 +0100 |
| commit | b6388b5101d8187f746f91c89842e932a1d01cb6 (patch) | |
| tree | 70bd9ba7012f5906db01b485ec8f58f5a4697240 /inc/cub3d.h | |
| parent | close but no cigar (diff) | |
| parent | ca tue (diff) | |
| download | 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.gz 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.bz2 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.xz 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.zst 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.zip | |
get merged
Diffstat (limited to 'inc/cub3d.h')
| -rw-r--r-- | inc/cub3d.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 7de1df7..016677a 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -27,11 +27,13 @@ void ft_init_ref(t_cub *clist); int8_t ft_init_cub3d(t_cub *clist); int ft_init_winlx(t_cub *clist); int ft_init_winptr(t_cub *clist); +t_player ft_init_player(void); t_ray ft_init_s_ray(void); t_rgb ft_init_rgb(void); int8_t ft_init_map(t_map *mlist); t_bmp_file ft_init_bmp(void); t_bmp_info ft_init_bmp_info(void); +t_rgb ft_hex_to_og_rgb(uint32_t color); /* ** ====== HOOKS ====== @@ -76,8 +78,10 @@ void ft_sprite_width(t_cub *cl, t_sprite *sprite); void ft_sprite_height(t_cub *cl, t_sprite *sprite); void ft_calc_sprite(t_cub *cl); void ft_draw_sprite(t_cub *cl, t_sprite *sprite); -void ft_get_sprite_spawn(t_cub *cl); +void ft_calc_trap(t_cub *cl); +void ft_draw_traps(t_cub *cl, t_sprite *sprite); void ft_draw_skybox(t_cub *cl); +void ft_suffer_animation(t_cub *cl); /* ** ====== PARSING ====== @@ -101,10 +105,13 @@ int8_t ft_get_c_tex(char **words, t_cub *clist); int8_t ft_get_darkness(char **words, t_cub *clist); int8_t ft_get_path_nl(char **words, t_cub *clist); int8_t ft_get_skybox(char **words, t_cub *clist); +int8_t ft_get_traps(char **words, t_cub *clist); int8_t ft_get_tex_nl(char **words, t_cub *clist); int8_t ft_get_music(char **words, t_cub *clist); size_t ft_get_map_h(char **map); size_t ft_get_map_w(char **map); +void ft_get_sprite_spawn(t_cub *clist); +void ft_get_trap_spawn(t_cub *clist); int8_t ft_check_map_line(char *line, uint8_t l, t_cub *clist); int8_t ft_check_ext(const char *filep, const char *ext); int8_t ft_check_not_found(const char *path); @@ -130,7 +137,8 @@ uint8_t ft_use_args(int argc, const char *argv[], void ft_castray(t_cub *cl); void ft_detect(t_cub *cl); -void ft_floor_cast(uint16_t y, t_cub *cl); +void ft_floor_cast(t_cub *cl); +void ft_floor_cast_inits(uint16_t y, t_ray *rl, t_cub *cl); /* ** ====== OTHER ====== |