From 85c492e848463a6e6b6b2bcc4572273854c068f3 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Thu, 9 Mar 2023 02:01:57 -0700 Subject: [PATCH] Wavedashing no longer puts everyone in your netgame into a hurricane --- src/k_kart.c | 8 ++++---- src/sounds.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 368d4cb0c..627d7411b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9414,7 +9414,7 @@ static void K_KartDrift(player_t *player, boolean onground) if (K_IsLosingSliptideZip(player) && player->sliptideZip > 0) { if (!S_SoundPlaying(player->mo, sfx_waved2)) - S_StartSound(player->mo, sfx_waved2); + S_StartSoundAtVolume(player->mo, sfx_waved2, 255/2); // Losing combo time, going to boost S_StopSoundByID(player->mo, sfx_waved1); S_StopSoundByID(player->mo, sfx_waved4); player->sliptideZipDelay++; @@ -9448,7 +9448,7 @@ static void K_KartDrift(player_t *player, boolean onground) S_StopSoundByID(player->mo, sfx_waved1); S_StopSoundByID(player->mo, sfx_waved2); S_StopSoundByID(player->mo, sfx_waved4); - S_StartSound(player->mo, sfx_waved3); + S_StartSoundAtVolume(player->mo, sfx_waved3, 2*255/3); // Boost } } else @@ -9456,7 +9456,7 @@ static void K_KartDrift(player_t *player, boolean onground) S_StopSoundByID(player->mo, sfx_waved1); S_StopSoundByID(player->mo, sfx_waved2); if (player->sliptideZip > 0 && !S_SoundPlaying(player->mo, sfx_waved4)) - S_StartSound(player->mo, sfx_waved4); + S_StartSoundAtVolume(player->mo, sfx_waved4, 2*255/5); // Passive woosh } player->aizdrifttilt -= player->aizdrifttilt / 4; @@ -9473,7 +9473,7 @@ static void K_KartDrift(player_t *player, boolean onground) S_StopSoundByID(player->mo, sfx_waved2); S_StopSoundByID(player->mo, sfx_waved4); if (!S_SoundPlaying(player->mo, sfx_waved1)) - S_StartSound(player->mo, sfx_waved1); + S_StartSoundAtVolume(player->mo, sfx_waved1, 255/2); // Charging } if (player->drift diff --git a/src/sounds.c b/src/sounds.c index dcaf42e76..4e369edd7 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -1131,10 +1131,10 @@ sfxinfo_t S_sfx[NUMSFX] = {"gate04", false, 32, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"gate05", false, 32, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"waved1", false, 32, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"waved2", false, 32, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"waved1", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"waved2", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"waved3", false, 32, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"waved4", false, 32, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"waved4", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Passing sounds {"pass01", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},