diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-15 16:06:39 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-15 16:06:39 +0100 |
| commit | 5a2b45a9c6d8235f5027a22132920fc28f2602c8 (patch) | |
| tree | 09c4ca149aba38a88d604fbee20c916dab225681 | |
| parent | Footsteps are bav (diff) | |
| download | 42-cub3d-5a2b45a9c6d8235f5027a22132920fc28f2602c8.tar.gz 42-cub3d-5a2b45a9c6d8235f5027a22132920fc28f2602c8.tar.bz2 42-cub3d-5a2b45a9c6d8235f5027a22132920fc28f2602c8.tar.xz 42-cub3d-5a2b45a9c6d8235f5027a22132920fc28f2602c8.tar.zst 42-cub3d-5a2b45a9c6d8235f5027a22132920fc28f2602c8.zip | |
Edited sounds, bug fix
| -rw-r--r-- | media/sound/sfx/death_screen.wav | bin | 1459980 -> 1255372 bytes | |||
| -rw-r--r-- | media/sound/sfx/footstep_one.wav | bin | 44892 -> 24298 bytes | |||
| -rw-r--r-- | media/sound/sfx/footstep_two.wav | bin | 42954 -> 25562 bytes | |||
| -rw-r--r-- | media/sound/sfx/next_lvl.wav | bin | 792004 -> 547516 bytes | |||
| -rw-r--r-- | media/sound/sfx/scream_one.wav | bin | 26392 -> 24112 bytes | |||
| -rw-r--r-- | media/sound/sfx/scream_two.wav | bin | 34140 -> 28996 bytes | |||
| -rw-r--r-- | media/sound/sfx/trap.wav | bin | 108532 -> 60508 bytes | |||
| -rw-r--r-- | src/ft_sfx_pain.c | 19 |
8 files changed, 10 insertions, 9 deletions
diff --git a/media/sound/sfx/death_screen.wav b/media/sound/sfx/death_screen.wav Binary files differindex 61cf33d..5ee6f4d 100644 --- a/media/sound/sfx/death_screen.wav +++ b/media/sound/sfx/death_screen.wav diff --git a/media/sound/sfx/footstep_one.wav b/media/sound/sfx/footstep_one.wav Binary files differindex f8f4577..898363e 100644 --- a/media/sound/sfx/footstep_one.wav +++ b/media/sound/sfx/footstep_one.wav diff --git a/media/sound/sfx/footstep_two.wav b/media/sound/sfx/footstep_two.wav Binary files differindex 4186e35..01781e1 100644 --- a/media/sound/sfx/footstep_two.wav +++ b/media/sound/sfx/footstep_two.wav diff --git a/media/sound/sfx/next_lvl.wav b/media/sound/sfx/next_lvl.wav Binary files differindex 64cbc31..2b73389 100644 --- a/media/sound/sfx/next_lvl.wav +++ b/media/sound/sfx/next_lvl.wav diff --git a/media/sound/sfx/scream_one.wav b/media/sound/sfx/scream_one.wav Binary files differindex df9fc78..0bdab05 100644 --- a/media/sound/sfx/scream_one.wav +++ b/media/sound/sfx/scream_one.wav diff --git a/media/sound/sfx/scream_two.wav b/media/sound/sfx/scream_two.wav Binary files differindex 1d4ff78..3ccb161 100644 --- a/media/sound/sfx/scream_two.wav +++ b/media/sound/sfx/scream_two.wav diff --git a/media/sound/sfx/trap.wav b/media/sound/sfx/trap.wav Binary files differindex 7d237e5..ae41e07 100644 --- a/media/sound/sfx/trap.wav +++ b/media/sound/sfx/trap.wav diff --git a/src/ft_sfx_pain.c b/src/ft_sfx_pain.c index 28bc95d..cb68108 100644 --- a/src/ft_sfx_pain.c +++ b/src/ft_sfx_pain.c @@ -28,15 +28,12 @@ void pthread_mutex_lock(&sfx->pain_mutex); while (1) { + pthread_mutex_lock(&sfx->pain_mutex); ref = (ref > 201) ? (0) : (ref + 1); - if (ref % 2) - { - pthread_mutex_lock(&sfx->pain_mutex); - if (ref % 3) - system(sfx->pain_one); - else - system(sfx->pain_two); - } + if (ref % 3) + system(sfx->pain_one); + else + system(sfx->pain_two); } return (NULL); } @@ -44,5 +41,9 @@ void void ft_sfx_pain(t_cub *cl) { - pthread_mutex_unlock(&cl->sfx.pain_mutex); + static uint8_t ref = 0; + + ref = (ref > 201) ? (0) : (ref + 1); + if (ref % 2) + pthread_mutex_unlock(&cl->sfx.pain_mutex); } |