thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'quieter-wavedash' into 'master'

Browse source 
Quieter wavedashing

See merge request KartKrew/Kart!1035
This commit is contained in:
Oni 2023-03-09 09:05:55 +00:00
commit 60863a88a3
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_kart.c
View file

@ -9414,7 +9414,7 @@ static void K_KartDrift(player_t *player, boolean onground)
if (K_IsLosingSliptideZip(player) && player->sliptideZip > 0) if (K_IsLosingSliptideZip(player) && player->sliptideZip > 0)
{ {
if (!S_SoundPlaying(player->mo, sfx_waved2)) 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_waved1);
S_StopSoundByID(player->mo, sfx_waved4); S_StopSoundByID(player->mo, sfx_waved4);
player->sliptideZipDelay++; 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_waved1);
S_StopSoundByID(player->mo, sfx_waved2); S_StopSoundByID(player->mo, sfx_waved2);
S_StopSoundByID(player->mo, sfx_waved4); S_StopSoundByID(player->mo, sfx_waved4);
S_StartSound(player->mo, sfx_waved3); S_StartSoundAtVolume(player->mo, sfx_waved3, 2*255/3); // Boost
} }
} }
else 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_waved1);
S_StopSoundByID(player->mo, sfx_waved2); S_StopSoundByID(player->mo, sfx_waved2);
if (player->sliptideZip > 0 && !S_SoundPlaying(player->mo, sfx_waved4)) 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; 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_waved2);
S_StopSoundByID(player->mo, sfx_waved4); S_StopSoundByID(player->mo, sfx_waved4);
if (!S_SoundPlaying(player->mo, sfx_waved1)) 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 if (player->drift

6
src/sounds.c
View file

@ -1131,10 +1131,10 @@ sfxinfo_t S_sfx[NUMSFX] =
{"gate04", false, 32, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"gate04", false, 32, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"gate05", 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, ""}, {"waved1", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"waved2", false, 32, 64, -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, ""}, {"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 // Passing sounds
{"pass01", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"pass01", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},