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

Do not play overtake voices/passing sounds in K_Cooperative

Browse source 
You're not competing!
This commit is contained in:
toaster 2024-03-30 16:01:03 +00:00
parent a752ed095f
commit 56534a747e
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/k_kart.c
View file

@ -2749,13 +2749,6 @@ void K_PlayOvertakeSound(mobj_t *source)
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;
// 4 seconds from before race begins, 10 seconds afterwards
if (leveltime < starttime+(10*TICRATE))
return;
if ( if (
cv_kartvoices.value cv_kartvoices.value
&& (tasteful || cv_kartvoices.value == 2) && (tasteful || cv_kartvoices.value == 2)
@ -11100,7 +11093,7 @@ void K_KartUpdatePosition(player_t *player)
if (position != oldposition) // Changed places? if (position != oldposition) // Changed places?
{ {
if (player->positiondelay <= 0 && position < oldposition && P_IsDisplayPlayer(player) == true) if (!K_Cooperative() && player->positiondelay <= 0 && position < oldposition && P_IsDisplayPlayer(player) == true)
{ {
// Play sound when getting closer to 1st. // Play sound when getting closer to 1st.
UINT32 soundpos = (max(0, position - 1) * MAXPLAYERS)/realplayers; // always 1-15 despite there being 16 players at max... UINT32 soundpos = (max(0, position - 1) * MAXPLAYERS)/realplayers; // always 1-15 despite there being 16 players at max...
@ -12100,14 +12093,23 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
boolean HOLDING_ITEM = (player->itemflags & (IF_ITEMOUT|IF_EGGMANOUT)); boolean HOLDING_ITEM = (player->itemflags & (IF_ITEMOUT|IF_EGGMANOUT));
boolean NO_HYUDORO = (player->stealingtimer == 0); boolean NO_HYUDORO = (player->stealingtimer == 0);
if (!player->exiting) // Play overtake sounds, but only if
// - your place changed
// - not exiting
// - in relevant gametype
// - more than 10 seconds after initial scramble
if (player->oldposition != player->position
&& !player->exiting
&& (gametyperules & GTR_CIRCUIT)
&& !K_Cooperative()
&& leveltime >= starttime+(10*TICRATE))
{ {
if (player->oldposition < player->position) // But first, if you lost a place, if (player->oldposition < player->position) // But first, if you lost a place,
{ {
player->oldposition = player->position; // then the other player taunts. player->oldposition = player->position; // then the other player taunts.
K_RegularVoiceTimers(player); // and you can't for a bit K_RegularVoiceTimers(player); // and you can't for a bit
} }
else if (player->oldposition > player->position) // Otherwise, else // Otherwise,
{ {
K_PlayOvertakeSound(player->mo); // Say "YOU'RE TOO SLOW!" K_PlayOvertakeSound(player->mo); // Say "YOU'RE TOO SLOW!"
player->oldposition = player->position; // Restore the old position, player->oldposition = player->position; // Restore the old position,