From 67de2faea2b7cdf1d864ae5a89bb5314fbbf8c11 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Thu, 19 Mar 2020 17:38:10 +0100 Subject: Added new sfx --- inc/cub3d_defines.h | 28 +++++++++++++++------------- media/sound/sfx/colt_fire.wav | Bin 0 -> 113012 bytes media/sound/sfx/colt_load.wav | Bin 0 -> 54956 bytes media/sound/sfx/heal.wav | Bin 0 -> 179652 bytes media/sound/sfx/sword_fire.wav | Bin 0 -> 89174 bytes media/sound/sfx/sword_load.wav | Bin 0 -> 107944 bytes media/sound/sfx/weapon_two_load.wav | Bin 54956 -> 0 bytes src/ft_check_missing.c | 3 +++ 8 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 media/sound/sfx/colt_fire.wav create mode 100644 media/sound/sfx/colt_load.wav create mode 100644 media/sound/sfx/heal.wav create mode 100644 media/sound/sfx/sword_fire.wav create mode 100644 media/sound/sfx/sword_load.wav delete mode 100644 media/sound/sfx/weapon_two_load.wav diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 89af3c3..21ed9fc 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -93,10 +93,11 @@ enum # define FT_SFX_SCR_ONE_PATH "./media/sound/sfx/scream_one.wav" # define FT_SFX_SCR_TWO_PATH "./media/sound/sfx/scream_two.wav" # define FT_SFX_TRAP_PATH "./media/sound/sfx/trap.wav" -# define FT_SFX_W_ONE_LOAD_PATH "./media/sound/sfx/weapon_two_load.wav" -# define FT_SFX_W_ONE_FIRE_PATH "./media/sound/sfx/weapon_two_load.wav" -# define FT_SFX_W_TWO_LOAD_PATH "./media/sound/sfx/weapon_two_load.wav" -# define FT_SFX_W_TWO_FIRE_PATH "./media/sound/sfx/weapon_two_load.wav" +# define FT_SFX_HEAL_PATH "./media/sound/sfx/heal.wav" +# define FT_SFX_W_ONE_LOAD_PATH "./media/sound/sfx/sword_load.wav" +# define FT_SFX_W_ONE_FIRE_PATH "./media/sound/sfx/sword_fire.wav" +# define FT_SFX_W_TWO_LOAD_PATH "./media/sound/sfx/colt_load.wav" +# define FT_SFX_W_TWO_FIRE_PATH "./media/sound/sfx/colt_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_WEAPON_ONE_SPR_PATH "./media/img/sprites/sword_s.xpm" @@ -224,15 +225,16 @@ enum # define FT_ERR_MISS_CEIL_C "ceiling color" # define FT_ERR_MISS_PLAYER_SPAWN "player spawn" # define FT_ERR_MISS_TRAP "traps" -# define FT_ERR_MISS_SFX_DEATH "sound effect death" -# define FT_ERR_MISS_SFX_N_LVL "sound effect new level" -# define FT_ERR_MISS_SFX_SCR_ONE "sound effect scream one" -# define FT_ERR_MISS_SFX_SCR_TWO "sound effect scream two" -# define FT_ERR_MISS_SFX_TRAP "sound effect trap" -# define FT_ERR_MISS_SFX_W_ONE_LOAD "sound effect weapon one load" -# define FT_ERR_MISS_SFX_W_ONE_FIRE "sound effect weapon one fire" -# define FT_ERR_MISS_SFX_W_TWO_LOAD "sound effect weapon two load" -# define FT_ERR_MISS_SFX_W_TWO_FIRE "sound effect weapon two fire" +# define FT_ERR_MISS_SFX_DEATH "death sound effect" +# define FT_ERR_MISS_SFX_N_LVL "new level sound effect" +# define FT_ERR_MISS_SFX_SCR_ONE "scream one sound effect" +# define FT_ERR_MISS_SFX_SCR_TWO "scream two sound effect" +# define FT_ERR_MISS_SFX_TRAP "trap sound effect" +# define FT_ERR_MISS_SFX_HEAL "heal sound effect" +# define FT_ERR_MISS_SFX_W_ONE_LOAD "weapon one load sound effect" +# define FT_ERR_MISS_SFX_W_ONE_FIRE "weapon one fire sound effect" +# define FT_ERR_MISS_SFX_W_TWO_LOAD "weapon two load sound effect" +# define FT_ERR_MISS_SFX_W_TWO_FIRE "weapon two fire 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/media/sound/sfx/colt_fire.wav b/media/sound/sfx/colt_fire.wav new file mode 100644 index 0000000..cea3053 Binary files /dev/null and b/media/sound/sfx/colt_fire.wav differ diff --git a/media/sound/sfx/colt_load.wav b/media/sound/sfx/colt_load.wav new file mode 100644 index 0000000..ce35094 Binary files /dev/null and b/media/sound/sfx/colt_load.wav differ diff --git a/media/sound/sfx/heal.wav b/media/sound/sfx/heal.wav new file mode 100644 index 0000000..395ddcf Binary files /dev/null and b/media/sound/sfx/heal.wav differ diff --git a/media/sound/sfx/sword_fire.wav b/media/sound/sfx/sword_fire.wav new file mode 100644 index 0000000..7fa9561 Binary files /dev/null and b/media/sound/sfx/sword_fire.wav differ diff --git a/media/sound/sfx/sword_load.wav b/media/sound/sfx/sword_load.wav new file mode 100644 index 0000000..96924e7 Binary files /dev/null and b/media/sound/sfx/sword_load.wav differ diff --git a/media/sound/sfx/weapon_two_load.wav b/media/sound/sfx/weapon_two_load.wav deleted file mode 100644 index ce35094..0000000 Binary files a/media/sound/sfx/weapon_two_load.wav and /dev/null differ diff --git a/src/ft_check_missing.c b/src/ft_check_missing.c index 8619c9d..2681143 100644 --- a/src/ft_check_missing.c +++ b/src/ft_check_missing.c @@ -32,6 +32,9 @@ static int if (ft_check_not_found(FT_SFX_TRAP_PATH) < 0 || ft_check_ext(FT_SFX_TRAP_PATH, ".wav") < 0) return (ft_missing_error(FT_ERR_MISS_SFX_TRAP, clist)); + if (ft_check_not_found(FT_SFX_HEAL_PATH) < 0 || + ft_check_ext(FT_SFX_HEAL_PATH, ".wav") < 0) + return (ft_missing_error(FT_ERR_MISS_SFX_HEAL, clist)); if (ft_check_not_found(FT_SFX_W_ONE_LOAD_PATH) < 0 || ft_check_ext(FT_SFX_W_ONE_LOAD_PATH, ".wav") < 0) return (ft_missing_error(FT_ERR_MISS_SFX_W_ONE_LOAD, clist)); -- cgit v1.2.3