aboutsummaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-03-14 01:06:59 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-03-14 01:06:59 +0100
commita383bde7d29293919eb635aeb14760a7a55e12b3 (patch)
tree76000460117d1ab1348d98a03e2c92215755fde8 /inc
parentFuck threads and forks (diff)
download42-cub3d-a383bde7d29293919eb635aeb14760a7a55e12b3.tar.gz
42-cub3d-a383bde7d29293919eb635aeb14760a7a55e12b3.tar.bz2
42-cub3d-a383bde7d29293919eb635aeb14760a7a55e12b3.tar.xz
42-cub3d-a383bde7d29293919eb635aeb14760a7a55e12b3.tar.zst
42-cub3d-a383bde7d29293919eb635aeb14760a7a55e12b3.zip
Removed footsteps, in progress
Diffstat (limited to 'inc')
-rw-r--r--inc/cub3d.h4
-rw-r--r--inc/cub3d_defines.h4
-rw-r--r--inc/cub3d_structs.h3
3 files changed, 2 insertions, 9 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h
index 8148561..278b2e1 100644
--- a/inc/cub3d.h
+++ b/inc/cub3d.h
@@ -145,12 +145,12 @@ void ft_floor_cast(t_cub *cl);
void ft_floor_cast_inits(uint16_t y, t_ray *rl, t_cub *cl);
/*
-** ====== ARGS ======
+** ====== SFX ======
*/
void ft_sfx_death(t_cub *cl);
-void ft_sfx_footstep(t_cub *cl);
void ft_sfx_trap(t_cub *cl);
+void ft_sfx_new_level(t_cub *cl);
/*
** ====== OTHER ======
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h
index 7257108..1e00aa2 100644
--- a/inc/cub3d_defines.h
+++ b/inc/cub3d_defines.h
@@ -89,8 +89,6 @@ enum
# define FT_SND_CMD "/usr/bin/aplay -f cd -t wav -q %s"
# endif
# define FT_SFX_DEATH_PATH "./media/sound/sfx/death_screen.wav"
-# define FT_SFX_FS_ONE_PATH "./media/sound/sfx/footstep_one.wav"
-# define FT_SFX_FS_TWO_PATH "./media/sound/sfx/footstep_two.wav"
# define FT_SFX_N_LVL_PATH "./media/sound/sfx/next_lvl.wav"
# define FT_SFX_SCR_ONE_PATH "./media/sound/sfx/scream_one.wav"
# define FT_SFX_SCR_TWO_PATH "./media/sound/sfx/scream_two.wav"
@@ -198,8 +196,6 @@ enum
# define FT_ERR_MISS_PLAYER_SPAWN "player spawn"
# define FT_ERR_MISS_TRAP "traps"
# define FT_ERR_MISS_SFX_DEATH "missing sound effect death"
-# define FT_ERR_MISS_SFX_FS_ONE "missing sound effect footstep one"
-# define FT_ERR_MISS_SFX_FS_TWO "missing sound effect footstep two"
# define FT_ERR_MISS_SFX_N_LVL "missing sound effect new level"
# define FT_ERR_MISS_SFX_SCR_ONE "missing sound effect scream one"
# define FT_ERR_MISS_SFX_SCR_TWO "missing sound effect scream two"
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h
index 04ee59c..96ed172 100644
--- a/inc/cub3d_structs.h
+++ b/inc/cub3d_structs.h
@@ -58,14 +58,11 @@ typedef struct s_bmp_info
typedef struct s_sfx
{
char **death;
- char **footstep_one;
- char **footstep_two;
char **new_lvl;
char **pain_one;
char **pain_two;
char **trap;
pid_t death_pid;
- pid_t footstep_pid;
pid_t new_lvl_pid;
pid_t pain_pid;
pid_t trap_pid;