diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-23 16:21:36 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-23 16:21:36 +0100 |
| commit | 06ce772faa11c3ef38e00b85c56b6b195bf68c56 (patch) | |
| tree | c77f9aaabb0d7c433dc2006dbc4f9a31fd101327 /inc | |
| parent | It's going well (diff) | |
| download | 42-cub3d-06ce772faa11c3ef38e00b85c56b6b195bf68c56.tar.gz 42-cub3d-06ce772faa11c3ef38e00b85c56b6b195bf68c56.tar.bz2 42-cub3d-06ce772faa11c3ef38e00b85c56b6b195bf68c56.tar.xz 42-cub3d-06ce772faa11c3ef38e00b85c56b6b195bf68c56.tar.zst 42-cub3d-06ce772faa11c3ef38e00b85c56b6b195bf68c56.zip | |
Stuff to fix but ok
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 1 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 1 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 10 |
3 files changed, 8 insertions, 4 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index c6165ac..1531023 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -80,6 +80,7 @@ void ft_draw_ammo_back(t_cub *cl); void ft_draw_health_caption(t_cub *cl); void ft_draw_ammo_caption(t_cub *cl); void ft_draw_life_bar(t_cub *cl); +void ft_draw_ammo_bar(t_cub *cl); void ft_draw_scene(t_cub *clist); void ft_draw_scene_bmp(t_cub *clist); void ft_draw_circle(float a, float b, diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 0d3b606..244ed94 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -293,5 +293,6 @@ enum # define FT_WEAP_ONE_STRT_AMMO -4 # define FT_WEAP_TWO_STRT_AMMO 30 # define FT_WEAP_THREE_STRT_AMMO 24 +# define FT_WEAP_MAX_AMMO 1000 # endif diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index e23d6c2..680f91a 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -239,16 +239,18 @@ typedef struct s_cub pthread_t mtid; int8_t isdead; uint8_t moves; - uint16_t life_cap_h; - uint16_t life_cap_w; - uint16_t life_num_h; - uint16_t life_num_w; uint16_t map_back_h; uint16_t map_back_w; uint16_t amm_back_h; uint16_t amm_back_w; + uint16_t life_cap_h; + uint16_t life_cap_w; + uint16_t life_num_h; + uint16_t life_num_w; uint16_t ammo_cap_h; uint16_t ammo_cap_w; + uint16_t ammo_num_h; + uint16_t ammo_num_w; int (*key_ptr[6])(struct s_cub*); int8_t (*get_ptr[14])(char**, struct s_cub*); char ref[22][3]; |