thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-11 09:12:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'moosick' into 'master'

Browse source 
Don't play Invincbility or Grow music while spectating players (closes #68)

Closes #68

See merge request KartKrew/Kart!281
This commit is contained in:
Sal 2020-06-07 04:20:44 -04:00
commit 0287c76d49
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_kart.c
View file

@ -6877,9 +6877,9 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
P_SetScale(overlay, player->mo->scale);
}
player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds
if (P_IsDisplayPlayer(player))
if (P_IsLocalPlayer(player))
S_ChangeMusicSpecial("kinvnc");
else
if (! P_IsDisplayPlayer(player))
S_StartSound(player->mo, (cv_kartinvinsfx.value ? sfx_alarmg : sfx_kinvnc));
P_RestoreMusic(player);
K_PlayPowerGloatSound(player->mo);
@ -7081,9 +7081,9 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
player->mo->destscale = (6*player->mo->destscale)/8;
player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds
if (P_IsDisplayPlayer(player))
if (P_IsLocalPlayer(player))
S_ChangeMusicSpecial("kgrow");
else
if (! P_IsDisplayPlayer(player))
S_StartSound(player->mo, (cv_kartinvinsfx.value ? sfx_alarmg : sfx_kgrow));
P_RestoreMusic(player);
S_StartSound(player->mo, sfx_kc5a);