diff options
author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-23 16:49:30 +0100 |
---|---|---|
committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-23 16:49:30 +0100 |
commit | 314a8e07226d1f4c9d9537371963c233d781ac08 (patch) | |
tree | a23ef16ba76449f0742d73b10513464c64bcc0ea /inc | |
parent | Stuff to fix but ok (diff) | |
download | 42-cub3d-314a8e07226d1f4c9d9537371963c233d781ac08.tar.gz 42-cub3d-314a8e07226d1f4c9d9537371963c233d781ac08.tar.bz2 42-cub3d-314a8e07226d1f4c9d9537371963c233d781ac08.tar.xz 42-cub3d-314a8e07226d1f4c9d9537371963c233d781ac08.tar.zst 42-cub3d-314a8e07226d1f4c9d9537371963c233d781ac08.zip |
sfx: good
Diffstat (limited to 'inc')
-rw-r--r-- | inc/cub3d.h | 2 | ||||
-rw-r--r-- | inc/cub3d_defines.h | 2 | ||||
-rw-r--r-- | inc/cub3d_structs.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 1531023..0d8fede 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -181,6 +181,7 @@ void ft_sfx_weapon_two_load(t_sfx *sfx); void ft_sfx_weapon_two_fire(t_sfx *sfx); void ft_sfx_weapon_three_load(t_sfx *sfx); void ft_sfx_weapon_three_fire(t_sfx *sfx); +void ft_sfx_ooa(t_sfx *sfx); void *ft_sfx_death_thread(void *vargp); void *ft_sfx_footstep_thread(void *vargp); void *ft_sfx_new_lvl_thread(void *vargp); @@ -193,6 +194,7 @@ void *ft_sfx_weapon_two_load_thread(void *vargp); void *ft_sfx_weapon_two_fire_thread(void *vargp); void *ft_sfx_weapon_three_load_thread(void *vargp); void *ft_sfx_weapon_three_fire_thread(void *vargp); +void *ft_sfx_ooa_thread(void *vargp); /* ** ====== DELETION ====== diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 244ed94..4ef2391 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -108,6 +108,7 @@ enum # define FT_SFX_W_TWO_FIRE_PATH "./media/sound/sfx/colt_fire.wav" # 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_SFX_OOA_PATH "./media/sound/sfx/ooa.wav" # define FT_DEATH_SCREEN_PATH "./media/img/screens/death_screen.xpm" # define FT_HUD_BACK_PATH "./media/img/hud/hud_back.xpm" # define FT_WEAPON_ONE_SPR_PATH "./media/img/weapons/sword_s.xpm" @@ -265,6 +266,7 @@ enum # define FT_ERR_MISS_SFX_W_TWO_FIRE "weapon two fire sound effect" # define FT_ERR_MISS_SFX_W_THREE_LOAD "weapon three load sound effect" # define FT_ERR_MISS_SFX_W_THREE_FIRE "weapon three fire sound effect" +# define FT_ERR_MISS_SFX_OOA "out of ammunitions sound effect" # define FT_ERR_MISS_DEATH_SCREEN "death screen image" # define FT_ERR_MISS_HUD_BACK "HUD background image" # define FT_ERR_MISS_HEAL_PACK "heal pack image" diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 680f91a..809963c 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -269,7 +269,7 @@ typedef struct s_cub struct s_sprite traps[512]; struct s_sprite heals[64]; struct s_sprite **weaps; - struct s_sfx sfx[12]; + struct s_sfx sfx[13]; } t_cub; # endif |