diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-19 21:59:13 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-19 21:59:13 +0100 |
| commit | b135ba89ccceffa88356cc25f256b0cb2adbd88c (patch) | |
| tree | 1e87c98d28857abfea2c5199dfdf77516ab28898 /inc | |
| parent | Rework in progress (diff) | |
| download | 42-cub3d-b135ba89ccceffa88356cc25f256b0cb2adbd88c.tar.gz 42-cub3d-b135ba89ccceffa88356cc25f256b0cb2adbd88c.tar.bz2 42-cub3d-b135ba89ccceffa88356cc25f256b0cb2adbd88c.tar.xz 42-cub3d-b135ba89ccceffa88356cc25f256b0cb2adbd88c.tar.zst 42-cub3d-b135ba89ccceffa88356cc25f256b0cb2adbd88c.zip | |
The og OOP
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 10 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 22 |
2 files changed, 11 insertions, 21 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index d543dbb..2affbcd 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -164,11 +164,21 @@ void ft_sfx_footstep(t_sfx *sfx); void ft_sfx_new_level(t_sfx *sfx); void ft_sfx_pain(t_sfx *sfx); void ft_sfx_trap(t_sfx *sfx); +void ft_sfx_heal(t_sfx *sfx); +void ft_sfx_weapon_one_load(t_sfx *sfx); +void ft_sfx_weapon_one_fire(t_sfx *sfx); +void ft_sfx_weapon_two_load(t_sfx *sfx); +void ft_sfx_weapon_two_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); void *ft_sfx_pain_thread(void *vargp); void *ft_sfx_trap_thread(void *vargp); +void *ft_sfx_heal_thread(void *vargp); +void *ft_sfx_weapon_one_load_thread(void *vargp); +void *ft_sfx_weapon_one_fire_thread(void *vargp); +void *ft_sfx_weapon_two_load_thread(void *vargp); +void *ft_sfx_weapon_two_fire_thread(void *vargp); /* ** ====== OTHER ====== diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 3ad9eec..4532a3d 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -62,27 +62,7 @@ typedef struct s_sfx char *cmd_alt; pthread_t tid; pthread_mutex_t mutex; - void (*ft_sfx_play)(struct s_sfx*); - - /* old */ - /* ========= */ - /* char *death; */ - /* char *footstep_one; */ - /* char *footstep_two; */ - /* char *new_lvl; */ - /* char *pain_one; */ - /* char *pain_two; */ - /* char *trap; */ - /* pthread_t death_tid; */ - /* pthread_t footstep_tid; */ - /* pthread_t new_lvl_tid; */ - /* pthread_t pain_tid; */ - /* pthread_t trap_tid; */ - /* pthread_mutex_t death_mutex; */ - /* pthread_mutex_t footstep_mutex; */ - /* pthread_mutex_t new_lvl_mutex; */ - /* pthread_mutex_t pain_mutex; */ - /* pthread_mutex_t trap_mutex; */ + void (*sfx_play)(struct s_sfx *); } t_sfx; typedef struct s_bmp_rgb |