diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 2 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 28 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 4 |
3 files changed, 20 insertions, 14 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index a4873bb..c6165ac 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -76,7 +76,9 @@ void ft_draw_map(char **map, t_cub *clist); void ft_draw_texture(t_cub *cl, int x, int y, int tex_y); int8_t ft_draw_hud(t_cub *clist); void ft_draw_minimap_back(t_cub *cl); +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_scene(t_cub *clist); void ft_draw_scene_bmp(t_cub *clist); diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index c3c5d66..43da0a7 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -109,7 +109,7 @@ enum # define FT_SFX_W_THREE_LOAD_PATH "./media/sound/sfx/double_b_load.wav" # define FT_SFX_W_THREE_FIRE_PATH "./media/sound/sfx/double_b_fire.wav" # define FT_DEATH_SCREEN_PATH "./media/img/screens/death_screen.xpm" -# define FT_HUD_BACK_PATH "./media/img/tex/plate_small.xpm" +# define FT_HUD_BACK_PATH "./media/img/hud/hud_back.xpm" # define FT_WEAPON_ONE_SPR_PATH "./media/img/weapons/sword_s.xpm" # define FT_WEAPON_TWO_SPR_PATH "./media/img/weapons/colt_s.xpm" # define FT_WEAPON_THREE_SPR_PATH "./media/img/weapons/double_b_s.xpm" @@ -120,19 +120,19 @@ enum # define FT_WEAPON_THREE_PATH "./media/img/weapons/double_b_w.xpm" # define FT_WEAPON_THREE_FIRE_PATH "./media/img/weapons/double_b_w_fire.xpm" # define FT_HEAL_PACK_PATH "./media/img/sprites/first_aid.xpm" -# define FT_ZER_PATH "./media/img/captions/zero.xpm" -# define FT_ONE_PATH "./media/img/captions/one.xpm" -# define FT_TWO_PATH "./media/img/captions/two.xpm" -# define FT_THR_PATH "./media/img/captions/three.xpm" -# define FT_FOU_PATH "./media/img/captions/four.xpm" -# define FT_FIV_PATH "./media/img/captions/five.xpm" -# define FT_SIX_PATH "./media/img/captions/six.xpm" -# define FT_SEV_PATH "./media/img/captions/seven.xpm" -# define FT_EIG_PATH "./media/img/captions/eight.xpm" -# define FT_NIN_PATH "./media/img/captions/nine.xpm" -# define FT_PER_PATH "./media/img/captions/percent.xpm" -# define FT_CAP_HEALTH_PATH "./media/img/captions/health.xpm" -# define FT_CAP_AMMO_PATH "./media/img/captions/ammo.xpm" +# define FT_ZER_PATH "./media/img/hud/zero.xpm" +# define FT_ONE_PATH "./media/img/hud/one.xpm" +# define FT_TWO_PATH "./media/img/hud/two.xpm" +# define FT_THR_PATH "./media/img/hud/three.xpm" +# define FT_FOU_PATH "./media/img/hud/four.xpm" +# define FT_FIV_PATH "./media/img/hud/five.xpm" +# define FT_SIX_PATH "./media/img/hud/six.xpm" +# define FT_SEV_PATH "./media/img/hud/seven.xpm" +# define FT_EIG_PATH "./media/img/hud/eight.xpm" +# define FT_NIN_PATH "./media/img/hud/nine.xpm" +# define FT_PER_PATH "./media/img/hud/percent.xpm" +# define FT_CAP_HEALTH_PATH "./media/img/hud/health.xpm" +# define FT_CAP_AMMO_PATH "./media/img/hud/ammo.xpm" /* ** ====== SOUNDS ====== diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 149ac7b..72796d3 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -245,6 +245,10 @@ typedef struct s_cub 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 ammo_cap_h; + uint16_t ammo_cap_w; int (*key_ptr[6])(struct s_cub*); int8_t (*get_ptr[14])(char**, struct s_cub*); char ref[22][3]; |