diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-31 16:19:22 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-31 16:19:22 +0200 |
| commit | 2ea18fb7e893691389108ae7731e26576715ca13 (patch) | |
| tree | c6a4ccfb785ff7289279d6b08997939c36b4c9ca /inc | |
| parent | Good (diff) | |
| download | 42-cub3d-2ea18fb7e893691389108ae7731e26576715ca13.tar.gz 42-cub3d-2ea18fb7e893691389108ae7731e26576715ca13.tar.bz2 42-cub3d-2ea18fb7e893691389108ae7731e26576715ca13.tar.xz 42-cub3d-2ea18fb7e893691389108ae7731e26576715ca13.tar.zst 42-cub3d-2ea18fb7e893691389108ae7731e26576715ca13.zip | |
Alright sounds
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 6 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 5 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index f392354..d86cf74 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -216,6 +216,9 @@ 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_bb_death(t_sfx *sfx); +void ft_sfx_bb_scream(t_sfx *sfx); +void ft_sfx_bb_fire(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); @@ -229,6 +232,9 @@ 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); +void *ft_sfx_bb_death_thread(void *vargp); +void *ft_sfx_bb_scream_thread(void *vargp); +void *ft_sfx_bb_fire_thread(void *vargp); /* ** ====== TIMINGS ====== diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 2c586d8..65d60fa 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -109,6 +109,10 @@ 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_SFX_OOA_PATH "./media/sound/sfx/ooa.wav" +# define FT_SFX_ENMY_DEATH_PATH "./media/sound/sfx/skel_death.wav" +# define FT_SFX_ENMY_SCR_ONE_PATH "./media/sound/sfx/skel_scream_one.wav" +# define FT_SFX_ENMY_SCR_TWO_PATH "./media/sound/sfx/skel_scream_two.wav" +# define FT_SFX_ENMY_FIRE_PATH "./media/sound/sfx/skel_gun.wav" # define FT_DEATH_SCREEN_PATH "./media/img/screens/death_screen.xpm" # define FT_HUD_BACK_PATH "./media/img/hud/hud_back_small.xpm" # define FT_WEAPON_ONE_SPR_PATH "./media/img/weapons/sword_s.xpm" @@ -274,6 +278,7 @@ enum # 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_SFX_ENMY "one or several enemy 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 9ebc305..7aea071 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -277,7 +277,7 @@ typedef struct s_cub struct s_img tweap[6]; struct s_img tnum[12]; struct s_sprite **sprites; - struct s_sfx sfx[13]; + struct s_sfx sfx[16]; struct s_bad_boy *bad_boy; } t_cub; |