From 3daf6fbfd7eaf704d95abcff9a3a070352005ff7 Mon Sep 17 00:00:00 2001 From: Sryder Date: Sat, 9 Jun 2018 00:04:20 +0100 Subject: [PATCH] Slightly longer delay between voices Fix win/lose quotes to work based on actual win/lose criteria Don't play overtake sound until at least 10 seconds into the race --- src/k_kart.c | 20 ++++++++++++-------- src/p_user.c | 6 +++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 70c8d08f..5333dbf0 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1200,8 +1200,8 @@ static void K_PlayTauntSound(mobj_t *source) if (source->player) { - source->player->kartstuff[k_tauntvoices] = 175; - source->player->kartstuff[k_voices] = 70; + source->player->kartstuff[k_tauntvoices] = 6*TICRATE; + source->player->kartstuff[k_voices] = 3*TICRATE; } } @@ -1210,14 +1210,18 @@ static void K_PlayOvertakeSound(mobj_t *source) if (source->player && source->player->kartstuff[k_voices]) // Prevents taunt sounds from playing every time the button is pressed return; + // 4 seconds from before race begins, 10 seconds afterwards + if (leveltime < 14*TICRATE) + return; + S_StartSound(source, sfx_slow); if (source->player) { - source->player->kartstuff[k_voices] = 70; + source->player->kartstuff[k_voices] = 3*TICRATE; - if (source->player->kartstuff[k_tauntvoices] < 70) - source->player->kartstuff[k_tauntvoices] = 70; + if (source->player->kartstuff[k_tauntvoices] < 3*TICRATE) + source->player->kartstuff[k_tauntvoices] = 3*TICRATE; } } @@ -1230,10 +1234,10 @@ static void K_PlayHitEmSound(mobj_t *source) if (source->player) { - source->player->kartstuff[k_voices] = 70; + source->player->kartstuff[k_voices] = 3*TICRATE; - if (source->player->kartstuff[k_tauntvoices] < 70) - source->player->kartstuff[k_tauntvoices] = 70; + if (source->player->kartstuff[k_tauntvoices] < 3*TICRATE) + source->player->kartstuff[k_tauntvoices] = 3*TICRATE; } } diff --git a/src/p_user.c b/src/p_user.c index 38e0307b..4666141c 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1677,10 +1677,10 @@ void P_DoPlayerExit(player_t *player) if (circuitmap) { - if (player->kartstuff[k_position] <= 3) - S_StartSound(player->mo, sfx_kwin); - else + if (K_IsPlayerLosing(player)) S_StartSound(player->mo, sfx_klose); + else + S_StartSound(player->mo, sfx_kwin); } if (P_IsLocalPlayer(player) && cv_inttime.value > 0)