Merge branch 'fix-tasteful-voices' into 'master'

Fix inverted cooldown check on player voices

Closes #1221

See merge request KartKrew/Kart!2186
This commit is contained in:
Oni 2024-03-29 19:37:07 +00:00
commit acbe25f0b1

View file

@ -2710,7 +2710,7 @@ static void K_PlayGenericTastefulTaunt(mobj_t *source, sfxenum_t sfx_id)
if (skinid >= numskins)
return;
boolean tasteful = (!source->player || source->player->karthud[khud_tauntvoices]);
boolean tasteful = (!source->player || !source->player->karthud[khud_tauntvoices]);
if (
cv_kartvoices.value
@ -2747,7 +2747,7 @@ void K_PlayOvertakeSound(mobj_t *source)
if (skinid >= numskins)
return;
boolean tasteful = (!source->player || source->player->karthud[khud_voices]);
boolean tasteful = (!source->player || !source->player->karthud[khud_voices]);
if (!(gametyperules & GTR_CIRCUIT)) // Only in race
return;