thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-06 16:12:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't reset special music in P_RestoreMusic

Browse source 
Because that resets Grow music when you stack Grow over Invincibility, and
Invincibility ends. (Also Megamix Themes.)

Thanks Snu, for calling P_RestoreMusic every tic!
This commit is contained in:
James R 2020-03-11 19:39:06 -07:00
parent 7e0aa16e70
commit 5e671b3483
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/k_kart.c
View file

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

4
src/p_user.c
View file

@ -1247,13 +1247,13 @@ void P_RestoreMusic(player_t *player)
// Item - Grow // Item - Grow
if (wantedmus == 2) if (wantedmus == 2)
{ {
S_ChangeMusicSpecial("kgrow"); S_ChangeMusicInternal("kgrow", true);
S_SetRestoreMusicFadeInCvar(&cv_growmusicfade); S_SetRestoreMusicFadeInCvar(&cv_growmusicfade);
} }
// Item - Invincibility // Item - Invincibility
else if (wantedmus == 1) else if (wantedmus == 1)
{ {
S_ChangeMusicSpecial("kinvnc"); S_ChangeMusicInternal("kinvnc", true);
S_SetRestoreMusicFadeInCvar(&cv_invincmusicfade); S_SetRestoreMusicFadeInCvar(&cv_invincmusicfade);
} }
else else