aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--inc/cub3d_defines.h28
-rw-r--r--media/sound/sfx/colt_fire.wavbin0 -> 113012 bytes
-rw-r--r--media/sound/sfx/colt_load.wav (renamed from media/sound/sfx/weapon_two_load.wav)bin54956 -> 54956 bytes
-rw-r--r--media/sound/sfx/heal.wavbin0 -> 179652 bytes
-rw-r--r--media/sound/sfx/sword_fire.wavbin0 -> 89174 bytes
-rw-r--r--media/sound/sfx/sword_load.wavbin0 -> 107944 bytes
-rw-r--r--src/ft_check_missing.c3
7 files changed, 18 insertions, 13 deletions
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
--- /dev/null
+++ b/media/sound/sfx/colt_fire.wav
Binary files differ
diff --git a/media/sound/sfx/weapon_two_load.wav b/media/sound/sfx/colt_load.wav
index ce35094..ce35094 100644
--- a/media/sound/sfx/weapon_two_load.wav
+++ b/media/sound/sfx/colt_load.wav
Binary files differ
diff --git a/media/sound/sfx/heal.wav b/media/sound/sfx/heal.wav
new file mode 100644
index 0000000..395ddcf
--- /dev/null
+++ b/media/sound/sfx/heal.wav
Binary files differ
diff --git a/media/sound/sfx/sword_fire.wav b/media/sound/sfx/sword_fire.wav
new file mode 100644
index 0000000..7fa9561
--- /dev/null
+++ b/media/sound/sfx/sword_fire.wav
Binary files differ
diff --git a/media/sound/sfx/sword_load.wav b/media/sound/sfx/sword_load.wav
new file mode 100644
index 0000000..96924e7
--- /dev/null
+++ b/media/sound/sfx/sword_load.wav
Binary files 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));