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

Slow down level music in Encore - "vape mode"

Browse source
This commit is contained in:
AJ Martinez 2023-07-28 19:33:02 -07:00 • committed by James R
parent b681fe226a
commit 5a703240bd
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_user.c
View file

@ -873,8 +873,6 @@ skippingposition:
if (jingle == NULL) if (jingle == NULL)
return; return;
S_SpeedMusic(1.0f);
S_ChangeMusicInternal(jingle, false); S_ChangeMusicInternal(jingle, false);
} }
@ -894,8 +892,6 @@ void P_RestoreMusic(player_t *player)
return; return;
} }
S_SpeedMusic(1.0f);
// Event - HERE COMES A NEW CHALLENGER // Event - HERE COMES A NEW CHALLENGER
if (mapreset) if (mapreset)
{ {

4
src/s_sound.c
View file

@ -2801,6 +2801,9 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
I_SetSongPosition(position); I_SetSongPosition(position);
I_SetSongTrack(mflags & MUSIC_TRACKMASK); I_SetSongTrack(mflags & MUSIC_TRACKMASK);
// Slow level music down a bit in Encore. (Values are vibe-based. WE GET IT YOU VAPE)
S_SpeedMusic((encoremode && gamestate == GS_LEVEL) ? 0.86471f : 1.f);
} }
else if (fadeinms) // let fades happen with same music else if (fadeinms) // let fades happen with same music
{ {
@ -2833,7 +2836,6 @@ void S_StopMusic(void)
if (I_SongPaused()) if (I_SongPaused())
I_ResumeSong(); I_ResumeSong();
S_SpeedMusic(1.0f);
I_StopSong(); I_StopSong();
S_UnloadMusic(); // for now, stopping also means you unload the song S_UnloadMusic(); // for now, stopping also means you unload the song